diff options
| author | Matt Riedemann <mriedem@us.ibm.com> | 2013-12-15 12:35:11 -0800 |
|---|---|---|
| committer | Matt Riedemann <mriedem@us.ibm.com> | 2013-12-17 18:24:41 -0800 |
| commit | 61d1ac502587ccae51a90d0cdf77d148d17b0506 (patch) | |
| tree | 4595604c8cf48109e1080dde92905db7a86661ac /nova/cloudpipe | |
| parent | 42566d7ca762de4531ad3c152ee415aebe76e165 (diff) | |
| download | nova-61d1ac502587ccae51a90d0cdf77d148d17b0506.tar.gz | |
Rename instance_type to flavor in nova.cloudpipe
Renames 'instance_type' to 'flavor' in the nova.cloudpipe module.
The deprecated vpn_instance_type option is removed as part of
change I64548e40f so I leave it untouched here.
Part of blueprint flavor-instance-type-dedup
Change-Id: Id4fd757fabfb81ee81999e7978c924aabd0a712b
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 0eabfe2a77..2387dc7f0d 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -129,12 +129,11 @@ class CloudPipe(object): LOG.debug(_("Launching VPN for %s") % (context.project_id)) key_name = self.setup_key_pair(context) group_name = self.setup_security_group(context) - instance_type = flavors.get_flavor_by_name( - CONF.vpn_flavor) + flavor = flavors.get_flavor_by_name(CONF.vpn_flavor) instance_name = '%s%s' % (context.project_id, CONF.vpn_key_suffix) user_data = self.get_encoded_zip(context.project_id) return self.compute_api.create(context, - instance_type, + flavor, CONF.vpn_image_id, display_name=instance_name, user_data=user_data, |