diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2013-05-07 20:08:53 +0000 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2013-05-07 21:41:19 +0000 |
| commit | 3222d8bb021effb3156ed86e263cdc0ac64fd44a (patch) | |
| tree | 748c322d33532f654acee8659ab9cc4725e68d53 /nova/cloudpipe | |
| parent | f917d24bd333e7068ae17cc1027dd8e80896e5a5 (diff) | |
| download | nova-3222d8bb021effb3156ed86e263cdc0ac64fd44a.tar.gz nova-3222d8bb021effb3156ed86e263cdc0ac64fd44a.tar.xz nova-3222d8bb021effb3156ed86e263cdc0ac64fd44a.zip | |
Rename nova.compute.instance_types to flavors
First step in removing references to instance_types. Rename instnace_types.py
and update references to it. We currently use instance_type and flavor as
synonyms, to reduce confusion we are picking one. We are going with our own
terminology, flavors.
renamed: nova/compute/instance_types.py -> nova/compute/flavors.py
Partially implements bp flavor-instance-type-dedup
Change-Id: I9dc04cf311aa8813be4f5329f23729d2c43cae6d
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index c395a754c..0727528c2 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -29,7 +29,7 @@ import zipfile from oslo.config import cfg from nova import compute -from nova.compute import instance_types +from nova.compute import flavors from nova import crypto from nova import db from nova import exception @@ -126,7 +126,7 @@ 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 = instance_types.get_instance_type_by_name( + instance_type = flavors.get_instance_type_by_name( CONF.vpn_instance_type) instance_name = '%s%s' % (context.project_id, CONF.vpn_key_suffix) user_data = self.get_encoded_zip(context.project_id) |