From 9d36842e3966185e97cc5732aa7a0edd2050bfe2 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 --- samples/fio.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'samples/fio.yaml') 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 -- cgit 1.2.3-korg