diff options
| author |   Emma Foley <emma.l.foley@intel.com> | 2019-01-21 11:19:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-01-21 11:19:39 +0000 |
| commit | 0a4751530e5bce828fd0b0946eb417d633b742f0 (patch) | |
| tree | ea8f702b9e4027c3b8daf11840a7c4d81bac4793 | |
| parent | fe251d2bf89ed3cd30b9b437279507f9b7e9c68f (diff) | |
| parent | 1e6069603e456d44c7ebdf430c2568005e3bdd8d (diff) | |
Merge "Pass the path of ssh public key to scenario method"
| -rw-r--r-- | yardstick/benchmark/contexts/heat.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/yardstick/benchmark/contexts/heat.py b/yardstick/benchmark/contexts/heat.py index c3c5451bd..f4c48f4a5 100644 --- 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') - + key_filename = pkg_resources.resource_filename('yardstick.resources', + h_join('files/yardstick_key', self.name)) 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), |