From 79bc2a14bfbc2f9aa148b23345e9bdd623ce0b2e Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Thu, 24 Jul 2014 14:02:12 +1200
Subject: [PATCH] Refresh the glance images for squid and te-broker

We shouldn't use load-image because it does bound kernels and we don't
need that in virt, so for now just delete-and-add.

Change-Id: Ie8ca0df410d5644deb459c2ba0c48af94f73c68a
---
 elements/tripleo-cd/bin/prepare-ci-overcloud | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/elements/tripleo-cd/bin/prepare-ci-overcloud b/elements/tripleo-cd/bin/prepare-ci-overcloud
index 00c6bf6ea..9a1c2331c 100755
--- a/elements/tripleo-cd/bin/prepare-ci-overcloud
+++ b/elements/tripleo-cd/bin/prepare-ci-overcloud
@@ -65,9 +65,11 @@ if [ ! -e $BROKER_IMG -o "$USE_CACHE" != "1" ] ; then
     $TRIPLEO_ROOT/diskimage-builder/bin/disk-image-create -a amd64 -o $BROKER_IMG \
         $TE_DISTRO vm geard stackuser dhcp-all-interfaces
 fi
-if ! glance image-show "te-broker" ; then
-    glance image-create --name "te-broker" --disk-format qcow2 --container-format bare --is-public 1 --file $BROKER_IMG --progress
+# XXX(lifeless) make a load-image patch for virt use
+if glance image-show te-broker &> /dev/null; then
+    glance image-delete te-broker
 fi
+glance image-create --name "te-broker" --disk-format qcow2 --container-format bare --is-public 1 --file $BROKER_IMG --progress
 
 NP_CREDS="--os-username=tripleo-ci --os-password=$TE_OVERCLOUDPASSWD --os-tenant-name=openstack-nodepool"
 if ! nova $NP_CREDS keypair-list | grep -q " default "; then
@@ -84,9 +86,11 @@ if [ ! -e $SQUID_IMG -o "$USE_CACHE" != "1" ] ; then
     $TRIPLEO_ROOT/diskimage-builder/bin/disk-image-create -a amd64 -o $SQUID_IMG \
         $TE_DISTRO vm squid stackuser dhcp-all-interfaces
 fi
-if ! glance image-show squid ; then
-    glance image-create --name squid --disk-format qcow2 --container-format bare --is-public 1 --file $SQUID_IMG --progress
+# XXX(lifeless) make a load-image patch for virt use
+if glance image-show squid &> /dev/null; then
+    glance image-delete squid
 fi
+glance image-create --name squid --disk-format qcow2 --container-format bare --is-public 1 --file $SQUID_IMG --progress
 
 if ! nova $NP_CREDS show squid ; then
     nova $NP_CREDS boot --image "squid" --flavor $TE_BROKER_FLAVOR --nic net-id=$DEFAULT_NET --nic net-id=$TESTNETID,v4-fixed-ip=192.168.1.253 --key-name default squid