adding build deps that have had to be installed manually

[apex.git] / build / instack.sh

diff --git a/build/instack.sh b/build/instack.sh
index 9b90069..f23df67 100755 (executable)
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -2,12 +2,14 @@
 set -e
 declare -i CNT
 
+rdo_images_uri=https://ci.centos.org/artifacts/rdo/images/liberty/delorean/stable
+
 vm_index=4
-RDO_RELEASE=kilo
+RDO_RELEASE=liberty
 SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null)
 
 # check for dependancy packages
-for i in libguestfs-tools; do
+for i in libguestfs-tools python-docutils bsdtar; do
     if ! rpm -q $i > /dev/null; then
         sudo yum install -y $i
     fi
@@ -187,13 +189,17 @@ sudo cp /var/lib/libvirt/images/instack.qcow2 ./instack.qcow2
 
 # pull down the the built images
 echo "Copying overcloud resources"
-IMAGES="deploy-ramdisk-ironic.initramfs deploy-ramdisk-ironic.kernel"
-IMAGES+=" ironic-python-agent.initramfs ironic-python-agent.kernel ironic-python-agent.vmlinuz"
-IMAGES+=" overcloud-full.initrd overcloud-full.qcow2  overcloud-full.vmlinuz"
+IMAGES="deploy-ramdisk-ironic.tar"
+IMAGES+=" ironic-python-agent.tar"
+IMAGES+=" overcloud-full.tar"
+#IMAGES+="undercloud.qcow2"
 
 for i in $IMAGES; do
   # download prebuilt images from RDO Project
-  curl https://repos.fedorapeople.org/repos/openstack-m/rdo-images-centos-liberty/$i -z stack/$i -o stack/$i --verbose --silent --location
+  if [ "$(curl -L $rdo_images_uri/${i}.md5 | awk {'print $1'})" != "$(md5sum stack/$i | awk {'print $1'})" ] ; then
+    curl https://ci.centos.org/artifacts/rdo/images/liberty/delorean/stable/$i -o stack/$i --verbose --silent --location
+  fi
+  tar -xf stack/$i -C stack/
 done
 
 #Adding OpenDaylight to overcloud
@@ -206,7 +212,7 @@ for i in opendaylight python-networking-odl; do
         LIBGUESTFS_BACKEND=direct virt-customize --upload $rpmfile:/tmp --install /tmp/$rpmfile -a overcloud-full-odl.qcow2
     else
         echo "Cannot install $i into overcloud-full image."
-       exit 1
+        exit 1
     fi
 done
 rm -rf puppet-opendaylight