diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-05 14:02:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-05 14:02:52 +0000 |
| commit | bfc5eb8f00f392b765ac2ca2f3665438ff783075 (patch) | |
| tree | 96633ddb0f1e54adad41d15b2bd2b6fb1a5cf165 | |
| parent | 0f56a837f2d0e778d4a71dee099c939b4cc5e91e (diff) | |
| parent | 2c84191d93fed209d6ae68cf80f52bbdca7646d7 (diff) | |
| download | nova-bfc5eb8f00f392b765ac2ca2f3665438ff783075.tar.gz nova-bfc5eb8f00f392b765ac2ca2f3665438ff783075.tar.xz nova-bfc5eb8f00f392b765ac2ca2f3665438ff783075.zip | |
Merge "network managers: Pass elevated cxtx to update_dhcp"
| -rw-r--r-- | nova/network/manager.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 7583eaef9..d1eef9d4a 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -2083,7 +2083,9 @@ class FlatDHCPManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): if not CONF.fake_network: dev = self.driver.get_dev(network) - self.driver.update_dhcp(context, dev, network) + # NOTE(dprince): dhcp DB queries require elevated context + elevated = context.elevated() + self.driver.update_dhcp(elevated, dev, network) if(CONF.use_ipv6): self.driver.update_ra(context, dev, network) gateway = utils.get_my_linklocal(dev) @@ -2094,7 +2096,9 @@ class FlatDHCPManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): if not CONF.fake_network: network['dhcp_server'] = self._get_dhcp_ip(context, network) dev = self.driver.get_dev(network) - self.driver.update_dhcp(context, dev, network) + # NOTE(dprince): dhcp DB queries require elevated context + elevated = context.elevated() + self.driver.update_dhcp(elevated, dev, network) def _get_network_dict(self, network): """Returns the dict representing necessary and meta network fields""" @@ -2262,7 +2266,9 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): network['vpn_private_address']) if not CONF.fake_network: dev = self.driver.get_dev(network) - self.driver.update_dhcp(context, dev, network) + # NOTE(dprince): dhcp DB queries require elevated context + elevated = context.elevated() + self.driver.update_dhcp(elevated, dev, network) if(CONF.use_ipv6): self.driver.update_ra(context, dev, network) gateway = utils.get_my_linklocal(dev) @@ -2273,7 +2279,9 @@ class VlanManager(RPCAllocateFixedIP, FloatingIP, NetworkManager): if not CONF.fake_network: network['dhcp_server'] = self._get_dhcp_ip(context, network) dev = self.driver.get_dev(network) - self.driver.update_dhcp(context, dev, network) + # NOTE(dprince): dhcp DB queries require elevated context + elevated = context.elevated() + self.driver.update_dhcp(elevated, dev, network) def _get_network_dict(self, network): """Returns the dict representing necessary and meta network fields""" |