Commit 46b80eeb authored by Dan Radez's avatar Dan Radez
Browse files

adding build deps that have had to be installed manually

Change-Id: I1af7ffdb1d1e4b96b31b44f2750de23b55d9d540
parent 15ed73f8
...@@ -9,7 +9,7 @@ RDO_RELEASE=liberty ...@@ -9,7 +9,7 @@ RDO_RELEASE=liberty
SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null) SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null)
# check for dependancy packages # 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 if ! rpm -q $i > /dev/null; then
sudo yum install -y $i sudo yum install -y $i
fi fi
...@@ -212,7 +212,7 @@ for i in opendaylight python-networking-odl; do ...@@ -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 LIBGUESTFS_BACKEND=direct virt-customize --upload $rpmfile:/tmp --install /tmp/$rpmfile -a overcloud-full-odl.qcow2
else else
echo "Cannot install $i into overcloud-full image." echo "Cannot install $i into overcloud-full image."
exit 1 exit 1
fi fi
done done
rm -rf puppet-opendaylight rm -rf puppet-opendaylight
......
...@@ -253,7 +253,7 @@ print data['nodes'][$i]['mac'][0]" ...@@ -253,7 +253,7 @@ print data['nodes'][$i]['mac'][0]"
old_mac=$(python -c "$pyscript") old_mac=$(python -c "$pyscript")
new_mac=$(virsh dumpxml baremetalbrbm_brbm1_$i | grep "mac address" | cut -d = -f2 | grep -Eo "[0-9a-f:]+") 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 #if [ "$old_mac" != "$new_mac" ]; then
# echo "${blue}Modifying MAC for node from $old_mac to ${new_mac}${reset}" # echo "${blue}Modifying MAC for node from $old_mac to ${new_mac}${reset}"
# sed -i 's/'"$old_mac"'/'"$new_mac"'/' $CONFIG/instackenv-virt.json # sed -i 's/'"$old_mac"'/'"$new_mac"'/' $CONFIG/instackenv-virt.json
...@@ -344,7 +344,7 @@ parse_cmdline() { ...@@ -344,7 +344,7 @@ parse_cmdline() {
;; ;;
-c|--config) -c|--config)
CONFIG=$2 CONFIG=$2
echo "Deployment Configuration Directory Overridden to: $2" echo "Deployment Configuration Directory Overridden to: $2"
shift 2 shift 2
;; ;;
-i|--instackenv) -i|--instackenv)
...@@ -357,22 +357,22 @@ parse_cmdline() { ...@@ -357,22 +357,22 @@ parse_cmdline() {
;; ;;
-p|--ping-site) -p|--ping-site)
ping_site=$2 ping_site=$2
echo "Using $2 as the ping site" echo "Using $2 as the ping site"
shift 2 shift 2
;; ;;
-r|--resources) -r|--resources)
RESOURCES=$2 RESOURCES=$2
echo "Deployment Resources Directory Overridden to: $2" echo "Deployment Resources Directory Overridden to: $2"
shift 2 shift 2
;; ;;
-v|--virtual) -v|--virtual)
virtual="TRUE" virtual="TRUE"
echo "Executing a Virtualized Deployment" echo "Executing a Virtualized Deployment"
shift 1 shift 1
;; ;;
--no-ha ) --no-ha )
ha_enabled="FALSE" ha_enabled="FALSE"
echo "HA Deployment Disabled" echo "HA Deployment Disabled"
shift 1 shift 1
;; ;;
*) *)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment