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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'samples/background-task.yaml') 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: -- cgit 1.2.3-korg