Merge "adding build deps that have had to be installed manually"

2 files changed, 9 insertions, 9 deletions

diff --git a/build/instack.sh b/build/instack.sh
index f73328ce..f23df672 100755
--- a/build/instack.sh
+++ b/build/instack.sh
@@ -9,7 +9,7 @@ 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
@@ -212,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
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 5a41e660..9e6c1e08 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -243,7 +243,7 @@ print data['nodes'][$i]['mac'][0]"
 
         old_mac=$(python -c "$pyscript")
         new_mac=$(virsh dumpxml baremetalbrbm_brbm1_$i | grep "mac address" | cut -d = -f2 | grep -Eo "[0-9a-f:]+")
-	# this doesn't work with multiple vnics on the vms
+        # this doesn't work with multiple vnics on the vms
         #if [ "$old_mac" != "$new_mac" ]; then
         #  echo "${blue}Modifying MAC for node from $old_mac to ${new_mac}${reset}"
         #  sed -i 's/'"$old_mac"'/'"$new_mac"'/' $CONFIG/instackenv-virt.json
@@ -340,7 +340,7 @@ parse_cmdline() {
             ;;
         -c|--config)
                 CONFIG=$2
-		echo "Deployment Configuration Directory Overridden to: $2"
+                echo "Deployment Configuration Directory Overridden to: $2"
                 shift 2
             ;;
         -i|--instackenv)
@@ -353,22 +353,22 @@ parse_cmdline() {
             ;;
         -p|--ping-site)
                 ping_site=$2
-		echo "Using $2 as the ping site"
+                echo "Using $2 as the ping site"
                 shift 2
             ;;
         -r|--resources)
                 RESOURCES=$2
-		echo "Deployment Resources Directory Overridden to: $2"
+                echo "Deployment Resources Directory Overridden to: $2"
                 shift 2
             ;;
         -v|--virtual)
                 virtual="TRUE"
-		echo "Executing a Virtualized Deployment"
+                echo "Executing a Virtualized Deployment"
                 shift 1
             ;;
         --no-ha )
-		ha_enabled="FALSE"
-		echo "HA Deployment Disabled"
+                ha_enabled="FALSE"
+                echo "HA Deployment Disabled"
                 shift 1
             ;;
         --flat )