summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-05-15 12:35:35 +0000
committerGerrit Code Review <review@openstack.org>2013-05-15 12:35:35 +0000
commitaf7823f5e7d4533f35841936a6c6fe1cdece6233 (patch)
tree4987e9b4fe5eba8286b72ea2eaa04fb737321005
parent1a845dafd908ccc89c7d8eafed57931a7799fadb (diff)
parent42cc18da31ceb10ec0b26fe734e7556873f6fe71 (diff)
downloadnova-af7823f5e7d4533f35841936a6c6fe1cdece6233.tar.gz
nova-af7823f5e7d4533f35841936a6c6fe1cdece6233.tar.xz
nova-af7823f5e7d4533f35841936a6c6fe1cdece6233.zip
Merge "Pass the proper admin context to update_dhcp"
-rw-r--r--nova/network/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 4eb242ed1..5d58edb97 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -1868,7 +1868,7 @@ class VlanManager(RPCAllocateFixedIP, floating_ips.FloatingIP, NetworkManager):
self.db.fixed_ip_update(context, network['dhcp_server'],
values)
else:
- self.driver.update_dhcp(context, dev, network)
+ self.driver.update_dhcp(elevated, dev, network)
def _get_network_dict(self, network):
"""Returns the dict representing necessary and meta network fields."""