diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-04 01:12:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-04 01:12:37 +0000 |
| commit | 382fb4f2c8c18a41d5b61609469fcea0deb2575e (patch) | |
| tree | a157417fd59d3cb673ad9262e90ce7c95716e7ca /nova | |
| parent | fbd8bf5adb55f97536ce7d52a9662ae8099684e7 (diff) | |
| parent | e1fb3413ed04008724db3f8ac705810537bfebb2 (diff) | |
| download | nova-382fb4f2c8c18a41d5b61609469fcea0deb2575e.tar.gz nova-382fb4f2c8c18a41d5b61609469fcea0deb2575e.tar.xz nova-382fb4f2c8c18a41d5b61609469fcea0deb2575e.zip | |
Merge "Remove unused variables"
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/compute/api.py | 4 | ||||
| -rw-r--r-- | nova/compute/manager.py | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index c0c7c099d..4f7e67105 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -974,7 +974,6 @@ class API(base.Base): task_state=[None]) def stop(self, context, instance, do_cast=True): """Stop an instance.""" - instance_uuid = instance["uuid"] LOG.debug(_("Going to try to stop instance"), instance=instance) self.update(context, @@ -1716,7 +1715,6 @@ class API(base.Base): def live_migrate(self, context, instance, block_migration, disk_over_commit, host): """Migrate a server lively to a new host.""" - instance_uuid = instance["uuid"] LOG.debug(_("Going to try to live migrate instance"), instance=instance) self.scheduler_rpcapi.live_migration(context, @@ -2126,7 +2124,6 @@ class SecurityGroupAPI(base.Base): self.db.instance_add_security_group(context.elevated(), instance_uuid, security_group['id']) - params = {"security_group_id": security_group['id']} # NOTE(comstud): No instance_uuid argument to this compute manager # call self.security_group_rpcapi.refresh_security_group_rules(context, @@ -2157,7 +2154,6 @@ class SecurityGroupAPI(base.Base): self.db.instance_remove_security_group(context.elevated(), instance_uuid, security_group['id']) - params = {"security_group_id": security_group['id']} # NOTE(comstud): No instance_uuid argument to this compute manager # call self.security_group_rpcapi.refresh_security_group_rules(context, diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 8da98767f..f86e20f40 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -538,7 +538,7 @@ class ComputeManager(manager.SchedulerDependentManager): extra_usage_info=extra_usage_info) except exception.InstanceNotFound: LOG.warn(_("Instance not found."), instance_uuid=instance_uuid) - except Exception as e: + except Exception: with excutils.save_and_reraise_exception(): self._set_instance_error_state(context, instance_uuid) @@ -1659,7 +1659,6 @@ class ComputeManager(manager.SchedulerDependentManager): self._notify_about_instance_usage( context, instance, "create_ip.start") - instance_id = instance['id'] self.network_api.add_fixed_ip_to_instance(context, instance, network_id) |