From 8681bc5960d91330a3afa3db5bd5a258901bb554 Mon Sep 17 00:00:00 2001 From: QiLiang Date: Thu, 14 Jan 2016 08:09:40 +0000 Subject: 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 (cherry picked from commit 9d36842e3966185e97cc5732aa7a0edd2050bfe2) --- samples/background-task.yaml | 2 +- samples/cpuload.yaml | 2 +- samples/cyclictest.yaml | 2 +- samples/fio-template.yaml | 4 ++-- samples/fio.yaml | 6 +++--- samples/iperf3-jitter.yaml | 2 +- samples/iperf3.yaml | 2 +- samples/lmbench.yaml | 2 +- samples/netperf.yaml | 2 +- samples/perf.yaml | 2 +- samples/pktgen.yaml | 2 +- samples/unixbench.yaml | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) (limited to 'samples') diff --git a/samples/background-task.yaml b/samples/background-task.yaml index f81867b33..a844c2d7f 100644 --- a/samples/background-task.yaml +++ b/samples/background-task.yaml @@ -41,7 +41,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: 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: diff --git a/samples/cyclictest.yaml b/samples/cyclictest.yaml index 6a16bd234..cb85decb1 100644 --- a/samples/cyclictest.yaml +++ b/samples/cyclictest.yaml @@ -35,7 +35,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu servers: kvm: floating_ip: true diff --git a/samples/fio-template.yaml b/samples/fio-template.yaml index ce64cdee2..ba710d95f 100644 --- a/samples/fio-template.yaml +++ b/samples/fio-template.yaml @@ -13,7 +13,7 @@ scenarios: - type: Fio options: - filename: /home/ec2-user/data.raw + filename: /home/ubuntu/data.raw bs: {{bs}} rw: {{rw}} ramp_time: 10 @@ -30,7 +30,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu servers: fio: floating_ip: true diff --git a/samples/fio.yaml b/samples/fio.yaml index 6e77f681a..e1f5e6d2d 100644 --- a/samples/fio.yaml +++ b/samples/fio.yaml @@ -5,7 +5,7 @@ # For this sample just like running the command below on the test vm and # getting benchmark info back to the yardstick. # -# sudo fio -filename=/home/ec2-user/data.raw -bs=4k -ipdepth=1 -rw=rw \ +# sudo fio -filename=/home/ubuntu/data.raw -bs=4k -ipdepth=1 -rw=rw \ # -ramp_time=10 -runtime=60 -name=yardstick-fio -ioengine=libaio \ # -direct=1 -group_reporting -numjobs=1 -time_based \ # --output-format=json @@ -16,7 +16,7 @@ scenarios: - type: Fio options: - filename: /home/ec2-user/data.raw + filename: /home/ubuntu/data.raw bs: 4k iodepth: 1 rw: rw @@ -39,7 +39,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu servers: fio: floating_ip: true diff --git a/samples/iperf3-jitter.yaml b/samples/iperf3-jitter.yaml index 0544c4186..c211571d0 100644 --- a/samples/iperf3-jitter.yaml +++ b/samples/iperf3-jitter.yaml @@ -25,7 +25,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: diff --git a/samples/iperf3.yaml b/samples/iperf3.yaml index 561be81f5..72f260942 100644 --- a/samples/iperf3.yaml +++ b/samples/iperf3.yaml @@ -23,7 +23,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: diff --git a/samples/lmbench.yaml b/samples/lmbench.yaml index 4ef53c30b..311770c42 100644 --- a/samples/lmbench.yaml +++ b/samples/lmbench.yaml @@ -50,7 +50,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: diff --git a/samples/netperf.yaml b/samples/netperf.yaml index 6d1dd8ec9..4d7f7a798 100755 --- a/samples/netperf.yaml +++ b/samples/netperf.yaml @@ -48,7 +48,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: diff --git a/samples/perf.yaml b/samples/perf.yaml index b6ce2a226..541f846e7 100644 --- a/samples/perf.yaml +++ b/samples/perf.yaml @@ -32,7 +32,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu servers: hades: diff --git a/samples/pktgen.yaml b/samples/pktgen.yaml index d621cb730..ddafb27bd 100644 --- a/samples/pktgen.yaml +++ b/samples/pktgen.yaml @@ -40,7 +40,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu placement_groups: pgrp1: diff --git a/samples/unixbench.yaml b/samples/unixbench.yaml index 9af032f23..825fd767f 100644 --- a/samples/unixbench.yaml +++ b/samples/unixbench.yaml @@ -23,7 +23,7 @@ context: name: demo image: yardstick-trusty-server flavor: yardstick-flavor - user: ec2-user + user: ubuntu servers: Chang'e: -- cgit 1.2.3-korg