summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-11-02 22:56:49 +0000
committerGerrit Code Review <review@openstack.org>2012-11-02 22:56:49 +0000
commit1d641de80d14bec037181f63daabd03b39ca6ea5 (patch)
tree256d47e6f311dba30ecad6653e231cd0e715ad03 /nova
parent0b81eb659e660991b18c42c735bd9fc8b16e014e (diff)
parenteedd98477dd3b8a5561d30732b7ccf71e9a7d428 (diff)
downloadnova-1d641de80d14bec037181f63daabd03b39ca6ea5.tar.gz
nova-1d641de80d14bec037181f63daabd03b39ca6ea5.tar.xz
nova-1d641de80d14bec037181f63daabd03b39ca6ea5.zip
Merge "Use elevated context in disassociate_floating_ip"
Diffstat (limited to 'nova')
-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 0a42d8c61..afe79a664 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -589,7 +589,7 @@ class FloatingIP(object):
instance = self.db.instance_get_by_uuid(context,
fixed_ip['instance_uuid'])
service = self.db.service_get_by_host_and_topic(
- context, instance['host'], 'network')
+ context.elevated(), instance['host'], 'network')
if service and utils.service_is_up(service):
host = instance['host']
else: