Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[dovetail] split the sla check results into process recovery and service recov...
[yardstick.git]
/
yardstick
/
benchmark
/
contexts
/
heat.py
diff --git
a/yardstick/benchmark/contexts/heat.py
b/yardstick/benchmark/contexts/heat.py
index
c3c5451
..
f4c48f4
100644
(file)
--- a/
yardstick/benchmark/contexts/heat.py
+++ b/
yardstick/benchmark/contexts/heat.py
@@
-508,10
+508,12
@@
class HeatContext(Context):
pkey = pkg_resources.resource_string(
'yardstick.resources',
h_join('files/yardstick_key', self.name)).decode('utf-8')
pkey = pkg_resources.resource_string(
'yardstick.resources',
h_join('files/yardstick_key', self.name)).decode('utf-8')
-
+ key_filename = pkg_resources.resource_filename('yardstick.resources',
+ h_join('files/yardstick_key', self.name))
result = {
"user": server.context.user,
"pkey": pkey,
result = {
"user": server.context.user,
"pkey": pkey,
+ "key_filename": key_filename,
"private_ip": server.private_ip,
"interfaces": server.interfaces,
"routing_table": self.generate_routing_table(server),
"private_ip": server.private_ip,
"interfaces": server.interfaces,
"routing_table": self.generate_routing_table(server),