summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-05-31 18:15:08 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-31 18:15:08 +0000
commit8d816d93ff7504d43fd9ea1293acffc27090ad71 (patch)
tree563aca90ba9b2f73c88473ac24bddac6ef4308a6 /ci
parentd0b0b02020575667b317f47fa9c30694c1173903 (diff)
parent758d34828e8c95c02f8e1446c3c4348433ccc5ea (diff)
Merge "Fixing conditional for setting compute count"
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index b99a5693..36be93c2 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -502,7 +502,7 @@ function setup_virtual_baremetal {
EOF
# next create the virtual machines and add their definitions to the file
- if [ ha_enabled != "FALSE" && "$ha_enabled" != "false" ]; then
+ if [ ha_enabled == "False" ]; then
# 1 controller + computes
# zero based so just pass compute count
vm_index=$VM_COMPUTES
@@ -1065,7 +1065,6 @@ display_usage() {
echo -e " -n|--net-settings : Full path to network settings file. Optional."
echo -e " -p|--ping-site : site to use to verify IP connectivity. Optional. Defaults to 8.8.8.8"
echo -e " -v|--virtual : Virtualize overcloud nodes instead of using baremetal."
- echo -e " --no-ha : disable High Availability deployment scheme, this assumes a single controller and single compute node"
echo -e " --flat : disable Network Isolation and use a single flat network for the underlay network."
echo -e " --no-post-config : disable Post Install configuration."
echo -e " --debug : enable debug output."
@@ -1113,11 +1112,6 @@ parse_cmdline() {
echo "Executing a Virtual Deployment"
shift 1
;;
- --no-ha )
- ha_enabled="False"
- echo "HA Deployment Disabled"
- shift 1
- ;;
--flat )
net_isolation_enabled="FALSE"
echo "Underlay Network Isolation Disabled: using flat configuration"