summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2015-12-03 23:56:55 -0500
committerDan Radez <dradez@redhat.com>2015-12-04 00:02:38 -0500
commit46b80eeb284002aac64b4c2dcf41c9a75bc8b5d2 (patch)
tree8ed0226d0af881cb8565e26a3e05cc61af92cef0
parent15ed73f81608a038cfcea0a846ae9b38d6671e79 (diff)
adding build deps that have had to be installed manually
Change-Id: I1af7ffdb1d1e4b96b31b44f2750de23b55d9d540
-rwxr-xr-xbuild/instack.sh4
-rwxr-xr-xci/deploy.sh14
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 3fb6a0de..a3bdf562 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -253,7 +253,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
@@ -344,7 +344,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)
@@ -357,22 +357,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
;;
*)