From 780ee742328a476a96e1d5011024902a7e01d33b Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Tue, 8 Jan 2013 08:48:02 +0000
Subject: 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
---
 nova/cloudpipe/pipelib.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'nova/cloudpipe')

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__)
 
-- 
cgit