diff options
Diffstat (limited to 'yardstick/orchestrator')
-rw-r--r-- | yardstick/orchestrator/heat.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py index 470f938ed..8d535c252 100644 --- a/yardstick/orchestrator/heat.py +++ b/yardstick/orchestrator/heat.py @@ -353,8 +353,8 @@ class HeatTemplate(HeatObject): } def add_server(self, name, image, flavor, ports=None, networks=None, - scheduler_hints=None, key_name=None, user_data=None, - metadata=None, additional_properties=None): + scheduler_hints=None, user=None, key_name=None, + user_data=None, metadata=None, additional_properties=None): '''add to the template a Nova Server''' log.debug("adding Nova::Server '%s', image '%s', flavor '%s', " "ports %s", name, image, flavor, ports) @@ -370,6 +370,9 @@ class HeatTemplate(HeatObject): 'networks': [] # list of dictionaries } + if user: + server_properties['admin_user'] = user + if key_name: self.resources[name]['depends_on'] = [key_name] server_properties['key_name'] = {'get_resource': key_name} |