diff options
author | Ross Brattain <ross.b.brattain@intel.com> | 2018-03-01 16:16:12 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-03-01 16:16:12 +0000 |
commit | de8ce9889cfc9e9d62e26e53b5f27b2f4cd9ff06 (patch) | |
tree | afdbac758b24c391979b9a24a4b5d02b6e7a2783 /yardstick/orchestrator | |
parent | 0b340735f2a37b9a05d3d86f79aa706b3e43bb5d (diff) | |
parent | 5c2824d8e184a3ff63a52e7c7cca7b4e6f0c0222 (diff) |
Merge "Use context name instead of key_uuid"
Diffstat (limited to 'yardstick/orchestrator')
-rw-r--r-- | yardstick/orchestrator/heat.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py index 3c3d28146..cd4eb7234 100644 --- a/yardstick/orchestrator/heat.py +++ b/yardstick/orchestrator/heat.py @@ -30,17 +30,11 @@ from yardstick.common import template_format log = logging.getLogger(__name__) -HEAT_KEY_UUID_LENGTH = 8 - PROVIDER_SRIOV = "sriov" _DEPLOYED_STACKS = {} -def get_short_key_uuid(uuid): - return str(uuid)[:HEAT_KEY_UUID_LENGTH] - - class HeatStack(object): """Represents a Heat stack (deployed template) """ @@ -413,7 +407,7 @@ name (i.e. %s). } } - def add_keypair(self, name, key_uuid): + def add_keypair(self, name, key_id): """add to the template a Nova KeyPair""" log.debug("adding Nova::KeyPair '%s'", name) self.resources[name] = { @@ -425,7 +419,7 @@ name (i.e. %s). pkg_resources.resource_string( 'yardstick.resources', 'files/yardstick_key-' + - get_short_key_uuid(key_uuid) + '.pub'), + key_id + '.pub'), 'utf-8') } } |