diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-16 18:04:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-16 18:04:56 +0000 |
| commit | 7eea0b9dfeb5efe50eaf76697e8dc9fe2e16d4d7 (patch) | |
| tree | cb0d12c9a694eaf57300488b80c32b9893f42ede | |
| parent | 83388e7db382d17d92381541424f157941379d3f (diff) | |
| parent | 2649f14673f8ef5ca257583f1cdf5fe57d4734b9 (diff) | |
| download | nova-7eea0b9dfeb5efe50eaf76697e8dc9fe2e16d4d7.tar.gz nova-7eea0b9dfeb5efe50eaf76697e8dc9fe2e16d4d7.tar.xz nova-7eea0b9dfeb5efe50eaf76697e8dc9fe2e16d4d7.zip | |
Merge "Set host prior to allocating network information."
| -rw-r--r-- | nova/compute/manager.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index ab9227d25..6088cbf30 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -482,13 +482,14 @@ class ComputeManager(manager.SchedulerDependentManager): self._notify_about_instance_usage( context, instance, "create.start", extra_usage_info=extra_usage_info) - network_info = self._allocate_network(context, instance, - requested_networks) + network_info = None try: limits = filter_properties.get('limits', {}) with self.resource_tracker.resource_claim(context, instance, limits): + network_info = self._allocate_network(context, instance, + requested_networks) block_device_info = self._prep_block_device(context, instance) instance = self._spawn(context, instance, image_meta, @@ -533,7 +534,7 @@ class ComputeManager(manager.SchedulerDependentManager): try: self._deallocate_network(context, instance) except Exception: - # do not attempt retry if network de-allocation occurs: + # do not attempt retry if network de-allocation failed: _log_original_error() raise |