diff options
| author |   QiLiang <liangqi1@huawei.com> | 2016-01-14 08:09:40 +0000 |
|---|---|---|
| committer | qi liang <liangqi1@huawei.com> | 2016-01-15 01:10:25 +0000 |
| commit | 9d36842e3966185e97cc5732aa7a0edd2050bfe2 (patch) | |
| tree | dfe51fed8fe84188eb89bd4fd323d1c722967ab5 /tests/opnfv/test_cases | |
| parent | 9b8b765373abbb10289415312a24574ff122541a (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 'tests/opnfv/test_cases')
9 files changed, 10 insertions, 10 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml index 9e29ec2b1..899ee963c 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc001.yaml @@ -33,7 +33,7 @@ context: name: yardstick image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml index f89a3099e..6e50157fc 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc005.yaml @@ -9,7 +9,7 @@ scenarios: - type: Fio options: - filename: /home/ec2-user/data.raw + filename: /home/ubuntu/data.raw bs: {{bs}} rw: {{rw}} ramp_time: 10 @@ -37,7 +37,7 @@ context: name: yardstick-TC005 image: yardstick-trusty-server flavor: m1.small - user: ec2-user + user: ubuntu servers: fio: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml index 385e530ce..1cec80ff6 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc008.yaml @@ -39,7 +39,7 @@ context: name: yardstick-TC008 image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml index 4d46c0336..82a55d751 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc009.yaml @@ -34,7 +34,7 @@ context: name: yardstick-TC009 image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml index 42327f05f..aeb18543e 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc010.yaml @@ -27,7 +27,7 @@ context: name: yardstick-TC010 image: yardstick-trusty-server flavor: m1.small - user: ec2-user + user: ubuntu servers: demeter: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml index 0c54d0cf0..3bdb8cb9a 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc012.yaml @@ -28,7 +28,7 @@ context: name: demo image: yardstick-trusty-server flavor: m1.small - user: ec2-user + user: ubuntu servers: demeter: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml index f1b995371..648657f22 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc014.yaml @@ -21,7 +21,7 @@ context: name: yardstick-TC014 image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu servers: Chang'e: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml index a73dfee0a..5e2177a6e 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml @@ -66,7 +66,7 @@ context: name: yardstick-TC037 image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml index 59608e312..128f94045 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc038.yaml @@ -66,7 +66,7 @@ context: name: yardstick-TC038 image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: |