summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2011-09-22 18:22:42 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-09-23 10:26:22 -0400
commit21dcf669c72fddc7b26018388e678fe0b033e318 (patch)
tree6bbef45d7496a628c8aecae3a5cb05acc223f8aa /nova/compute
parent37100f5653960b7f898e91663839feed51e14419 (diff)
Fix outstanding pep8 errors for a clean trunk.
Also, add an option to run_tests.sh to skip running pep8. We have a separate job in Jenkins which runs pep8, so there's no need to spin our wheels on it during the test run. Change-Id: I552330994e55a36fa96b63658493ed30e2720c85
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 884f1f78f..0d504ab78 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -980,10 +980,10 @@ class ComputeManager(manager.SchedulerDependentManager):
{'instance_uuid': instance_ref['uuid'],
'source_compute': instance_ref['host'],
'dest_compute': FLAGS.host,
- 'dest_host': self.driver.get_host_ip_addr(),
+ 'dest_host': self.driver.get_host_ip_addr(),
'old_instance_type_id': old_instance_type['id'],
'new_instance_type_id': instance_type_id,
- 'status': 'pre-migrating'})
+ 'status': 'pre-migrating'})
LOG.audit(_('instance %s: migrating'), instance_ref['uuid'],
context=context)