diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 08:13:12 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-09 08:15:43 +0000 |
| commit | 39a46f48bfcaae1ca4500ba145c1c08c6bf009f1 (patch) | |
| tree | e6c6ea5637c8d1d2fc90b93cdce345ad71a0d6f2 /nova/tests | |
| parent | 41ef13a34c4fa41052ae72cc87e552dfd8ed91ba (diff) | |
Move vpn_image_id to pipelib
Apart from checking whether a given image is the cloudpipe image, the
vpn_image_id option is only used within pipelib itself.
Add a is_vpn_image() helper method and move the option into pipelib.
Some rejiggering of how pipelib imports ec2 opts is required to avoid
circular imports.
blueprint: scope-config-opts
Change-Id: Ie984b2bb81681c24d3cee803082960083992a535
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_cloudpipe.py | 2 | ||||
| -rw-r--r-- | nova/tests/integrated/test_api_samples.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py index 1ff26a60d..133554abd 100644 --- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py +++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py @@ -28,7 +28,7 @@ from nova.tests import matchers from nova import utils CONF = cfg.CONF -CONF.import_opt('vpn_image_id', 'nova.config') +CONF.import_opt('vpn_image_id', 'nova.cloudpipe.pipelib') def fake_vpn_instance(): diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index c15767a82..c0c92d370 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -51,7 +51,7 @@ CONF = cfg.CONF CONF.import_opt('allow_resize_to_same_host', 'nova.compute.api') CONF.import_opt('osapi_compute_extension', 'nova.api.openstack.compute.extensions') -CONF.import_opt('vpn_image_id', 'nova.config') +CONF.import_opt('vpn_image_id', 'nova.cloudpipe.pipelib') CONF.import_opt('osapi_compute_link_prefix', 'nova.api.openstack.common') CONF.import_opt('osapi_glance_link_prefix', 'nova.api.openstack.common') LOG = logging.getLogger(__name__) |