Merge "Use context name instead of key_uuid"

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')
             }
         }