summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
d374dc8)
get pkey after we have found the node
Change-Id: I0e67834b87ed5ba268ea9cb5cffb6c214aedeebb
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
attr_name: either a name for a server created by yardstick or a dict
with attribute name mapping when using external heat templates
"""
attr_name: either a name for a server created by yardstick or a dict
with attribute name mapping when using external heat templates
"""
- pkey = pkg_resources.resource_string(
- 'yardstick.resources',
- 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'])
if cname is None or cname != self.name:
if isinstance(attr_name, collections.Mapping):
node_name, cname = self.split_name(attr_name['name'])
if cname is None or cname != self.name:
if server is None:
return None
if server is None:
return None
+ pkey = pkg_resources.resource_string(
+ 'yardstick.resources',
+ h_join('files/yardstick_key', get_short_key_uuid(self.key_uuid))).decode('utf-8')
+
result = {
"user": server.context.user,
"pkey": pkey,
result = {
"user": server.context.user,
"pkey": pkey,