diff options
Diffstat (limited to 'yardstick/benchmark/contexts/heat.py')
| -rw-r--r-- | yardstick/benchmark/contexts/heat.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py index c7586abf4..374be0b1b 100644 --- a/yardstick/benchmark/contexts/heat.py +++ b/yardstick/benchmark/contexts/heat.py @@ -413,9 +413,9 @@ class HeatContext(Context): attr_name: either a name for a server created by yardstick or a dict with attribute name mapping when using external heat templates """ - key_filename = pkg_resources.resource_filename( + pkey = pkg_resources.resource_string( 'yardstick.resources', - h_join('files/yardstick_key', get_short_key_uuid(self.key_uuid))) + h_join('files/yardstick_key', get_short_key_uuid(self.key_uuid))).decode('utf-8') if isinstance(attr_name, collections.Mapping): node_name, cname = self.split_name(attr_name['name']) @@ -436,7 +436,7 @@ class HeatContext(Context): result = { "user": server.context.user, - "key_filename": key_filename, + "pkey": pkey, "private_ip": server.private_ip, "interfaces": server.interfaces, "routing_table": self.generate_routing_table(server), |