diff options
author | QiLiang <liangqi1@huawei.com> | 2016-01-14 08:09:40 +0000 |
---|---|---|
committer | qi liang <liangqi1@huawei.com> | 2016-01-15 01:16:47 +0000 |
commit | 8681bc5960d91330a3afa3db5bd5a258901bb554 (patch) | |
tree | dfe51fed8fe84188eb89bd4fd323d1c722967ab5 /yardstick/benchmark/contexts | |
parent | 09291f4499c36f7e30d3e6e3dc1364124b76e1a6 (diff) |
HeatContext model update to match heat code update
In Heat Liberty release OS::Nova::Server will always use the user
pre-configured in the image (e.g. "fedora" for stock Fedora cloud
images, "ubuntu" for stock Ubuntu cloud images, "cloud-user" for
stock CentOS cloud images etc)
Change all ec2-user -> ubuntu
Add admin-user in Heat model for backwards compatibility.
Refer below links for detalis:
https://etherpad.opnfv.org/p/yardstick_release_b_troubleshooting
https://github.com/openstack/heat/commit/e423bec7f10b0f5d07f05d195b3b7860f6bceb00
http://blog.scottlowe.org/2015/04/23/ubuntu-openstack-heat-cloud-init/
JIRA: -
Change-Id: I6b8b2b21daf113a3a86aee1126b0c3e74737ef4f
Signed-off-by: QiLiang <liangqi1@huawei.com>
(cherry picked from commit 9d36842e3966185e97cc5732aa7a0edd2050bfe2)
Diffstat (limited to 'yardstick/benchmark/contexts')
-rw-r--r-- | yardstick/benchmark/contexts/model.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/yardstick/benchmark/contexts/model.py b/yardstick/benchmark/contexts/model.py index 91020b92f..bb61c613d 100644 --- a/yardstick/benchmark/contexts/model.py +++ b/yardstick/benchmark/contexts/model.py @@ -118,6 +118,7 @@ class Server(Object): self.stack_name = self.name + "." + context.name self.keypair_name = context.keypair_name self.secgroup_name = context.secgroup_name + self.user = context.user self.context = context self.public_ip = None self.private_ip = None @@ -201,6 +202,7 @@ class Server(Object): template.add_server(server_name, self.image, self.flavor, ports=port_name_list, + user=self.user, key_name=self.keypair_name, scheduler_hints=scheduler_hints) |