summaryrefslogtreecommitdiff
path: root/nova/cloudpipe
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/cloudpipe
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/cloudpipe')
-rw-r--r--nova/cloudpipe/pipelib.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py
index 9d83862a48..63be694b88 100644
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@@ -28,6 +28,7 @@ import zipfile
from nova import compute
from nova.compute import instance_types
+from nova import config
from nova import crypto
from nova import db
from nova import exception
@@ -53,7 +54,9 @@ cloudpipe_opts = [
help=_('Netmask to push into openvpn config')),
]
-flags.DECLARE('cnt_vpn_clients', 'nova.network.manager')
+CONF = config.CONF
+CONF.import_opt('cnt_vpn_clients', 'nova.network.manager')
+
FLAGS = flags.FLAGS
FLAGS.register_opts(cloudpipe_opts)