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/scenarios | |
| 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/scenarios')
| -rw-r--r-- | yardstick/benchmark/scenarios/compute/cpuload.py | 2 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/storage/fio.py | 6 |
2 files changed, 4 insertions, 4 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 # } # } diff --git a/yardstick/benchmark/scenarios/storage/fio.py b/yardstick/benchmark/scenarios/storage/fio.py index 8969472e9..a8d27faba 100644 --- a/yardstick/benchmark/scenarios/storage/fio.py +++ b/yardstick/benchmark/scenarios/storage/fio.py @@ -23,7 +23,7 @@ class Fio(base.Scenario): filename - file name for fio workload type: string unit: na - default: /home/ec2-user/data.raw + default: /home/ubuntu/data.raw bs - block size used for the io units type: int unit: bytes @@ -82,7 +82,7 @@ class Fio(base.Scenario): self.setup() options = self.scenario_cfg["options"] - filename = options.get("filename", "/home/ec2-user/data.raw") + filename = options.get("filename", "/home/ubuntu/data.raw") bs = options.get("bs", "4k") iodepth = options.get("iodepth", "1") rw = options.get("rw", "write") @@ -162,7 +162,7 @@ def _test(): logger.setLevel(logging.DEBUG) options = { - "filename": "/home/ec2-user/data.raw", + "filename": "/home/ubuntu/data.raw", "bs": "4k", "iodepth": "1", "rw": "rw", |