diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-24 01:11:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-24 01:11:27 +0000 |
| commit | 2b42812e3c0f45cbbde6fe556f0fda50a1076cde (patch) | |
| tree | a09cfcc7c183f8b49a36909633262155df7b19c7 | |
| parent | 4c74a80064b249f6ae77291a984347f19d3720d6 (diff) | |
| parent | 695fa6ca4467e0cddb8964a4b9cd10a69ec83161 (diff) | |
| download | nova-2b42812e3c0f45cbbde6fe556f0fda50a1076cde.tar.gz nova-2b42812e3c0f45cbbde6fe556f0fda50a1076cde.tar.xz nova-2b42812e3c0f45cbbde6fe556f0fda50a1076cde.zip | |
Merge "Fixes error if Melange returns no networks"
| -rw-r--r-- | nova/network/quantum/manager.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/quantum/manager.py b/nova/network/quantum/manager.py index 79f278401..c6132056e 100644 --- a/nova/network/quantum/manager.py +++ b/nova/network/quantum/manager.py @@ -287,6 +287,7 @@ class QuantumManager(manager.FloatingIP, manager.FlatManager): project_id = kwargs['project_id'] LOG.debug(_("network allocations for instance %s"), project_id) requested_networks = kwargs.get('requested_networks') + instance = db.instance_get(context, instance_id) net_proj_pairs = self.ipam.get_project_and_global_net_ids(context, project_id) @@ -315,7 +316,6 @@ class QuantumManager(manager.FloatingIP, manager.FlatManager): project_id) # talk to Quantum API to create and attach port. - instance = db.instance_get(context, instance_id) nova_id = self._get_nova_id(instance) # Tell the ipam library to allocate an IP ips = self.ipam.allocate_fixed_ips(context, project_id, |