diff options
| author | Ed Leafe <ed@leafe.com> | 2010-12-23 12:07:42 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2010-12-23 12:07:42 -0600 |
| commit | 99854dbb46ef9b1d266bfb5e36a2b15733bef6ea (patch) | |
| tree | fbb0a020e179ae8214ce5e899534f01ad07c022f /nova/compute | |
| parent | 4d8d2e34369d67a91491f1c0c8e3ff2613e00d6f (diff) | |
| parent | a0ab2ffca9a4a578115f36319bbd8640b0521cb0 (diff) | |
| download | nova-99854dbb46ef9b1d266bfb5e36a2b15733bef6ea.tar.gz nova-99854dbb46ef9b1d266bfb5e36a2b15733bef6ea.tar.xz nova-99854dbb46ef9b1d266bfb5e36a2b15733bef6ea.zip | |
merged trunk
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 36699b685..177ddc840 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -205,8 +205,8 @@ class ComputeManager(manager.Manager): def reboot_instance(self, context, instance_id): """Reboot an instance on this server.""" context = context.elevated() - instance_ref = self.db.instance_get(context, instance_id) self._update_state(context, instance_id) + instance_ref = self.db.instance_get(context, instance_id) if instance_ref['state'] != power_state.RUNNING: logging.warn(_('trying to reboot a non-running ' @@ -220,6 +220,7 @@ class ComputeManager(manager.Manager): instance_id, power_state.NOSTATE, 'rebooting') + self.network_manager.setup_compute_network(context, instance_id) self.driver.reboot(instance_ref) self._update_state(context, instance_id) @@ -259,6 +260,7 @@ class ComputeManager(manager.Manager): instance_id, power_state.NOSTATE, 'rescuing') + self.network_manager.setup_compute_network(context, instance_id) self.driver.rescue(instance_ref) self._update_state(context, instance_id) |