summaryrefslogtreecommitdiff
path: root/nova/virt/netutils.py
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-10-15 02:03:34 +0100
committerMark McLoughlin <markmc@redhat.com>2012-11-04 21:38:38 +0000
commit8ce58defbe560b1da34d991b38ac64a9b4c8d654 (patch)
tree57d794afbc9fdb8e63c37198c9d2a6dff402cbf6 /nova/virt/netutils.py
parentefede80046e0504dc8a68ab5447f97b05c02dd7a (diff)
downloadnova-8ce58defbe560b1da34d991b38ac64a9b4c8d654.tar.gz
Remove flags.DECLARE
The cfg.ConfigOpts class has an equivalent method, so lets use that. Change-Id: I5860230336d00d7531a0ffd255c766ff77661625
Diffstat (limited to 'nova/virt/netutils.py')
-rw-r--r--nova/virt/netutils.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/virt/netutils.py b/nova/virt/netutils.py
index 671703ed14..05b642b8fa 100644
--- a/nova/virt/netutils.py
+++ b/nova/virt/netutils.py
@@ -23,12 +23,13 @@
import netaddr
+from nova import config
from nova import flags
FLAGS = flags.FLAGS
-
-flags.DECLARE('injected_network_template', 'nova.virt.disk.api')
+CONF = config.CONF
+CONF.import_opt('injected_network_template', 'nova.virt.disk.api')
Template = None