diff options
| author |   Tim Rozet <trozet@redhat.com> | 2015-12-04 16:28:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-04 16:28:06 +0000 |
| commit | 51ac87ec20ca9955e7fc63dd722ea2c0dbe49c32 (patch) | |
| tree | d24f90059e49723379894c641d52ba83cedf50f5 /ci | |
| parent | 45399b5b68e3172a0b8d3033ccc1c4a9af535e6b (diff) | |
| parent | 46b80eeb284002aac64b4c2dcf41c9a75bc8b5d2 (diff) | |
Merge "adding build deps that have had to be installed manually"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 14 |
1 files changed, 7 insertions, 7 deletions
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 ) |