aboutsummaryrefslogtreecommitdiffstats
path: root/samples/cpuload.yaml
diff options
context:
space:
mode:
authorQiLiang <liangqi1@huawei.com>2016-01-14 08:09:40 +0000
committerqi liang <liangqi1@huawei.com>2016-01-15 01:16:47 +0000
commit8681bc5960d91330a3afa3db5bd5a258901bb554 (patch)
treedfe51fed8fe84188eb89bd4fd323d1c722967ab5 /samples/cpuload.yaml
parent09291f4499c36f7e30d3e6e3dc1364124b76e1a6 (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 'samples/cpuload.yaml')
-rw-r--r--samples/cpuload.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/cpuload.yaml b/samples/cpuload.yaml
index e28d2d281..7ca528278 100644
--- a/samples/cpuload.yaml
+++ b/samples/cpuload.yaml
@@ -20,7 +20,7 @@ context:
name: demo
image: yardstick-trusty-server
flavor: yardstick-flavor
- user: ec2-user
+ user: ubuntu
servers:
apollo: