summaryrefslogtreecommitdiffstats
path: root/nova/cloudpipe
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2013-01-08 08:48:02 +0000
committerMark McLoughlin <markmc@redhat.com>2013-01-09 22:09:17 +0000
commit780ee742328a476a96e1d5011024902a7e01d33b (patch)
treec7050c2eb6c31bd3bb276aab7a5f38c49b52c280 /nova/cloudpipe
parent664ea40ebb0ee29a5fd11effeeed279ddc543f89 (diff)
Move vpn_key_suffix into pipelib
Apart from one use in the EC2 API, vpn_key_suffix is only used in pipelib. blueprint: scope-config-opts Change-Id: If90b9e77905161ea8d9263e8bae2c47ac5f79e91
Diffstat (limited to 'nova/cloudpipe')
-rw-r--r--nova/cloudpipe/pipelib.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py
index 19cbf3253..cb7fb8bac 100644
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@@ -54,11 +54,13 @@ cloudpipe_opts = [
cfg.StrOpt('dmz_mask',
default='255.255.255.0',
help=_('Netmask to push into openvpn config')),
+ cfg.StrOpt('vpn_key_suffix',
+ default='-vpn',
+ help='Suffix to add to project name for vpn key and secgroups'),
]
CONF = cfg.CONF
CONF.register_opts(cloudpipe_opts)
-CONF.import_opt('vpn_key_suffix', 'nova.config')
LOG = logging.getLogger(__name__)