Quickfix, apply_async timeout, graphite access, storage account

name in config

circle/vm/models/instance.py

@@ -872,7 +872,7 @@ class Instance(AclBase, VirtualMachineDescModel, StatusModel, OperatedMixin,
 
     @property
     def metric_prefix(self):
-        return 'vm.%s' % self.vm_name
+        return 'vm.%s' % self.name
 
     @contextmanager
     def activity(self, code_suffix, readable_name, on_abort=None,

circle/vm/models/network.py

@@ -171,7 +171,7 @@ class Interface(Model):
         result = net_tasks.create_azure_interface.apply_async(
             args=[iface.pk, vlan.name],
             queue="localhost.net.fast"
-        ).get()
+        ).get(timeout=60)
         if result["azure_id"]:
             logger.debug("created azure interface with id: %s" % (
                 result["azure_id"]))

circle/vm/operations.py

@@ -398,7 +398,7 @@ class DeployOperation(InstanceOperation):
         def _operation(self):
             nics = [str(nic_id) for nic_id in
                 self.instance.interface_set.values_list('azure_id', flat=True)]
-            storage_name = os.getenv("STORAGEACCOUNT")
+            storage_name = os.getenv("STORAGE_NAME")
             vm_size_version = self.instance.azure_template 
             vm_size_sku = vm_size_version.sku
             vm_size_offer = vm_size_sku.offer