aboutsummaryrefslogtreecommitdiffstats
path: root/yardstick/benchmark/scenarios/compute
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:10:25 +0000
commit9d36842e3966185e97cc5732aa7a0edd2050bfe2 (patch)
treedfe51fed8fe84188eb89bd4fd323d1c722967ab5 /yardstick/benchmark/scenarios/compute
parent9b8b765373abbb10289415312a24574ff122541a (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>
Diffstat (limited to 'yardstick/benchmark/scenarios/compute')
-rw-r--r--yardstick/benchmark/scenarios/compute/cpuload.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/yardstick/benchmark/scenarios/compute/cpuload.py b/yardstick/benchmark/scenarios/compute/cpuload.py
index 2b458ff64..d11bec5c3 100644
--- a/yardstick/benchmark/scenarios/compute/cpuload.py
+++ b/yardstick/benchmark/scenarios/compute/cpuload.py
@@ -219,7 +219,7 @@ class CPULoad(base.Scenario):
# ctx = {
# 'host': {
# 'ip': '172.16.0.175',
-# 'user': 'ec2-user',
+# 'user': 'ubuntu',
# 'key_filename': key_filename
# }
# }