From 758d34828e8c95c02f8e1446c3c4348433ccc5ea Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 31 May 2016 10:26:36 -0400 Subject: Fixing conditional for setting compute count - also removing no-ha option, python update to deploy settings do longer honor this param Change-Id: I52b84c946b3d5d774a001a18230c591060041eb2 Signed-off-by: Dan Radez --- ci/deploy.sh | 8 +------- 1 file changed, 1 insertion(+), 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" -- cgit 1.2.3-korg