From 44fe028dae4d368dde471455fd203527a8362293 Mon Sep 17 00:00:00 2001 From: John Trowbridge Date: Thu, 9 Apr 2015 15:12:23 -0400 Subject: [PATCH] Make instack-build-images build fedora-user by default If we build the fedora-user image by default, then the instack-test-overcloud script "just works". This provides a basic sanity check for the installed overcloud. Change-Id: Ia7aa73b7590a53810a8883af1707af0d9fa4c98d --- scripts/instack-build-images | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/instack-build-images b/scripts/instack-build-images index a44779968..c44c0c523 100755 --- a/scripts/instack-build-images +++ b/scripts/instack-build-images @@ -278,12 +278,12 @@ function overcloud-swift-storage { function fedora-user { if [ ! -f fedora-user.qcow2 ]; then - if [ -f ~/.cache/image-create/fedora-20.x86_64.qcow2 ]; then + if [ -f ~/.cache/image-create/fedora-21.x86_64.qcow2 ]; then # Just copy the already downloaded Fedora cloud image as fedora-user.qcow2 - cp ~/.cache/image-create/fedora-20.x86_64.qcow2 fedora-user.qcow2 + cp ~/.cache/image-create/fedora-21.x86_64.qcow2 fedora-user.qcow2 else # Download the image - curl -o fedora-user.qcow2 -L http://cloud.fedoraproject.org/fedora-20.x86_64.qcow2 + curl -o fedora-user.qcow2 -L http://cloud.fedoraproject.org/fedora-21.x86_64.qcow2 fi # The perms always seem to be wrong when copying out of the cache, so # fix them @@ -318,6 +318,7 @@ function os-disk-config { } if [ "$image_build" = "default" ]; then + fedora-user deploy-ramdisk discovery-ramdisk overcloud-full