diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 08:48:02 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-09 22:09:17 +0000 |
| commit | 780ee742328a476a96e1d5011024902a7e01d33b (patch) | |
| tree | c7050c2eb6c31bd3bb276aab7a5f38c49b52c280 | |
| parent | 664ea40ebb0ee29a5fd11effeeed279ddc543f89 (diff) | |
| download | nova-780ee742328a476a96e1d5011024902a7e01d33b.tar.gz nova-780ee742328a476a96e1d5011024902a7e01d33b.tar.xz nova-780ee742328a476a96e1d5011024902a7e01d33b.zip | |
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
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 | ||||
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 4 | ||||
| -rw-r--r-- | nova/config.py | 3 | ||||
| -rw-r--r-- | nova/tests/test_pipelib.py | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index ce7095808..5dd861e8d 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -72,7 +72,7 @@ ec2_opts = [ CONF = cfg.CONF CONF.register_opts(ec2_opts) CONF.import_opt('my_ip', 'nova.config') -CONF.import_opt('vpn_key_suffix', 'nova.config') +CONF.import_opt('vpn_key_suffix', 'nova.cloudpipe.pipelib') CONF.import_opt('internal_service_availability_zone', 'nova.availability_zones') 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__) diff --git a/nova/config.py b/nova/config.py index d9e2d8523..61152774b 100644 --- a/nova/config.py +++ b/nova/config.py @@ -47,9 +47,6 @@ global_opts = [ cfg.StrOpt('my_ip', default=_get_my_ip(), help='ip address of this host'), - cfg.StrOpt('vpn_key_suffix', - default='-vpn', - help='Suffix to add to project name for vpn key and secgroups'), cfg.StrOpt('host', default=socket.getfqdn(), help='Name of this node. This can be an opaque identifier. ' diff --git a/nova/tests/test_pipelib.py b/nova/tests/test_pipelib.py index b38b2238e..85c2ca2cd 100644 --- a/nova/tests/test_pipelib.py +++ b/nova/tests/test_pipelib.py @@ -21,7 +21,6 @@ from nova import test from nova import utils CONF = cfg.CONF -CONF.import_opt('vpn_key_suffix', 'nova.config') class PipelibTest(test.TestCase): |