HeatContext model update to match heat code update 47/6647/4
authorQiLiang <liangqi1@huawei.com>
Thu, 14 Jan 2016 08:09:40 +0000 (08:09 +0000)
committerqi liang <liangqi1@huawei.com>
Fri, 15 Jan 2016 01:10:25 +0000 (01:10 +0000)
commit9d36842e3966185e97cc5732aa7a0edd2050bfe2
treedfe51fed8fe84188eb89bd4fd323d1c722967ab5
parent9b8b765373abbb10289415312a24574ff122541a
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>
29 files changed:
docs/configguide/yardstick_testcases/Yardstick_task_templates.rst
docs/templates/Yardstick_task_templates.rst
samples/background-task.yaml
samples/cpuload.yaml
samples/cyclictest.yaml
samples/fio-template.yaml
samples/fio.yaml
samples/iperf3-jitter.yaml
samples/iperf3.yaml
samples/lmbench.yaml
samples/netperf.yaml
samples/perf.yaml
samples/pktgen.yaml
samples/unixbench.yaml
tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml
tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml
tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml
tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml
tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml
tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml
tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml
tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml
tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml
tests/unit/benchmark/contexts/test_model.py
tests/unit/benchmark/scenarios/storage/test_fio.py
yardstick/benchmark/contexts/model.py
yardstick/benchmark/scenarios/compute/cpuload.py
yardstick/benchmark/scenarios/storage/fio.py
yardstick/orchestrator/heat.py