diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 20:04:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 20:04:04 +0000 |
| commit | 039e7c2bdd055588139cbfbf356d24b736218966 (patch) | |
| tree | a1d98473f7d0f9255242168f46c33c11e185f0d5 /nova/api | |
| parent | f61b8216ecf61d20dd88d410a640331b192c30de (diff) | |
| parent | 39a46f48bfcaae1ca4500ba145c1c08c6bf009f1 (diff) | |
Merge "Move vpn_image_id to pipelib"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 | ||||
| -rw-r--r-- | nova/api/openstack/compute/contrib/cloudpipe.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index f570b566f..ce7095808 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -30,6 +30,7 @@ from nova.api.ec2 import inst_state from nova.api import validator from nova import availability_zones from nova import block_device +from nova.cloudpipe import pipelib from nova import compute from nova.compute import api as compute_api from nova.compute import instance_types @@ -71,7 +72,6 @@ ec2_opts = [ CONF = cfg.CONF CONF.register_opts(ec2_opts) CONF.import_opt('my_ip', 'nova.config') -CONF.import_opt('vpn_image_id', 'nova.config') CONF.import_opt('vpn_key_suffix', 'nova.config') CONF.import_opt('internal_service_availability_zone', 'nova.availability_zones') @@ -1132,7 +1132,7 @@ class CloudController(object): for instance in instances: if not context.is_admin: - if instance['image_ref'] == str(CONF.vpn_image_id): + if pipelib.is_vpn_image(instance['image_ref']): continue i = {} instance_uuid = instance['uuid'] diff --git a/nova/api/openstack/compute/contrib/cloudpipe.py b/nova/api/openstack/compute/contrib/cloudpipe.py index a58e80282..4e224be46 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe.py +++ b/nova/api/openstack/compute/contrib/cloudpipe.py @@ -31,7 +31,6 @@ from nova.openstack.common import timeutils from nova import utils CONF = cfg.CONF -CONF.import_opt('vpn_image_id', 'nova.config') LOG = logging.getLogger(__name__) authorize = extensions.extension_authorizer('compute', 'cloudpipe') @@ -77,7 +76,7 @@ class CloudpipeController(object): instances = self.compute_api.get_all(context, search_opts={'deleted': False}) return [instance for instance in instances - if instance['image_ref'] == str(CONF.vpn_image_id) + if pipelib.is_vpn_image(instance['image_ref']) and instance['vm_state'] != vm_states.DELETED] def _get_cloudpipe_for_project(self, context, project_id): |