openstack/nova
Code Issues Proposed changes

Rename instance_type to flavor in nova.cloudpipe

Browse Source 
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
This commit is contained in:
Matt Riedemann
2013-12-15 12:35:11 -08:00
parent 42566d7ca7
commit 61d1ac5025
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/cloudpipe/pipelib.py
View File

@@ -129,12 +129,11 @@ class CloudPipe(object):
LOG.debug(_("Launching VPN for %s") % (context.project_id)) LOG.debug(_("Launching VPN for %s") % (context.project_id))
key_name = self.setup_key_pair(context) key_name = self.setup_key_pair(context)
group_name = self.setup_security_group(context) group_name = self.setup_security_group(context)
instance_type = flavors.get_flavor_by_name( flavor = flavors.get_flavor_by_name(CONF.vpn_flavor)
CONF.vpn_flavor)
instance_name = '%s%s' % (context.project_id, CONF.vpn_key_suffix) instance_name = '%s%s' % (context.project_id, CONF.vpn_key_suffix)
user_data = self.get_encoded_zip(context.project_id) user_data = self.get_encoded_zip(context.project_id)
return self.compute_api.create(context, return self.compute_api.create(context,
instance_type, flavor,
CONF.vpn_image_id, CONF.vpn_image_id,
display_name=instance_name, display_name=instance_name,
user_data=user_data, user_data=user_data,