diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-01-29 01:29:39 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-01-29 01:29:39 -0500 |
| commit | 176cb1c73622c103831eae36f59d0497e4e0081c (patch) | |
| tree | ad36a738ea59b3df0c6e06391b735f40b4b47a3e | |
| parent | beafa30495ff06b565a68d6a2771c9116edf7e9f (diff) | |
Fixes bug where ha_enabled was detected as false when set true
Daily failed because, we removed the default value of "TRUE" for
ha_enabled, and deploy settings sets it as "true", which we were not
looking for as a boolean in deploy. This patch fixes that.
Change-Id: I03ac599aa2a35ae494e13f9293aef273ab3051e9
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rwxr-xr-x | ci/deploy.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index df528f50..5eabebb7 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -296,7 +296,7 @@ parse_inventory_file() { node_total=$node_count - if [[ "$node_total" -lt 5 && ha_enabled == "TRUE" ]]; then + if [[ "$node_total" -lt 5 && ( ha_enabled == "TRUE" || "$ha_enabled" == "true" ) ]]; then echo -e "${red}ERROR: You must provide at least 5 nodes for HA baremetal deployment${reset}" exit 1 elif [[ "$node_total" -lt 2 ]]; then @@ -816,7 +816,7 @@ function undercloud_prep_overcloud_deploy { total_nodes=$(ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "cat /home/stack/instackenv.json | grep -c memory") # check if HA is enabled - if [[ "$ha_enabled" == "TRUE" ]]; then + if [[ "$ha_enabled" == "TRUE" || "$ha_enabled" == "true" ]]; then DEPLOY_OPTIONS+=" --control-scale 3" compute_nodes=$((total_nodes - 3)) DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml" @@ -837,7 +837,7 @@ function undercloud_prep_overcloud_deploy { DEPLOY_OPTIONS+=" -e network-environment.yaml" fi - if [[ "$ha_enabled" == "TRUE" ]] || [[ "$net_isolation_enabled" == "TRUE" ]]; then + if [[ "$ha_enabled" == "TRUE" || "$ha_enabled" == "true" ]] || [[ "$net_isolation_enabled" == "TRUE" ]]; then DEPLOY_OPTIONS+=" --ntp-server $ntp_server" fi |