diff options
-rw-r--r-- | nova/network/manager.py | 2 | ||||
-rw-r--r-- | nova/network/quantum/melange_ipam_lib.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 843a419a9..ea65dc5a4 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -989,6 +989,8 @@ class NetworkManager(manager.SchedulerDependentManager): net['dns1'] = dns1 net['dns2'] = dns2 + net['project_id'] = kwargs.get('project_id') + if num_networks > 1: net['label'] = '%s_%d' % (label, index) else: diff --git a/nova/network/quantum/melange_ipam_lib.py b/nova/network/quantum/melange_ipam_lib.py index cbe13bf80..e880907b2 100644 --- a/nova/network/quantum/melange_ipam_lib.py +++ b/nova/network/quantum/melange_ipam_lib.py @@ -128,7 +128,7 @@ class QuantumMelangeIPAMLib(object): def get_project_networks(self, admin_context): try: - nets = db.network_get_all(context.elevated()) + nets = db.network_get_all(admin_context.elevated()) except exception.NoNetworksFound: return [] # only return networks with a project_id set |