summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wolf <throughnothing@gmail.com>2011-06-22 20:27:17 -0400
committerWilliam Wolf <throughnothing@gmail.com>2011-06-22 20:27:17 -0400
commitb0e24d4dd2f4918ed1cbf85af4b31fdd09def1f6 (patch)
tree733f0f14371fec50cecc46684041485f1a689349
parent0719207009779d0336f4699ba491cecee7a76020 (diff)
downloadnova-b0e24d4dd2f4918ed1cbf85af4b31fdd09def1f6.tar.gz
nova-b0e24d4dd2f4918ed1cbf85af4b31fdd09def1f6.tar.xz
nova-b0e24d4dd2f4918ed1cbf85af4b31fdd09def1f6.zip
fixed pep8 issues
-rw-r--r--nova/compute/manager.py21
1 files changed, 11 insertions, 10 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 3b98b9067..54eaf2082 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -306,8 +306,9 @@ class ComputeManager(manager.SchedulerDependentManager):
self.network_manager.setup_compute_network(context,
instance_id)
- block_device_mapping = self._setup_block_device_mapping(context,
- instance_id)
+ block_device_mapping = self._setup_block_device_mapping(
+ context,
+ instance_id)
# TODO(vish) check to make sure the availability zone matches
self._update_state(context, instance_id, power_state.BUILDING)
@@ -329,21 +330,21 @@ class ComputeManager(manager.SchedulerDependentManager):
floating_ip = self.db.floating_ip_get_by_address(context,
public_ip)
- self.network_api.associate_floating_ip(context,
- floating_ip,
- fixed_ip,
- affect_auto_assigned=True)
+ self.network_api.associate_floating_ip(
+ context,
+ floating_ip,
+ fixed_ip,
+ affect_auto_assigned=True)
self._update_launched_at(context, instance_id)
self._update_state(context, instance_id)
except exception.InstanceNotFound:
# FIXME(wwolf): We are just ignoring InstanceNotFound
- # exceptions here in case the instance was immediately deleted
- # before it actually got created. This should be fixed once we have
- # no-db-messaging
+ # exceptions here in case the instance was immediately
+ # deleted before it actually got created. This should
+ # be fixed once we have no-db-messaging
pass
-
@exception.wrap_exception
def run_instance(self, context, instance_id, **kwargs):
self._run_instance(context, instance_id, **kwargs)