summaryrefslogtreecommitdiffstats
path: root/ci/deploy.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-05-27 14:53:10 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-27 14:53:10 +0000
commit542964d123fa93f1f460ed73b477c4bcaa2a2034 (patch)
tree4b25b92e3fff2e72dc93b11d21d15903654c6da7 /ci/deploy.sh
parent343eb858209d1a0bd26b767b53d1915687819c60 (diff)
parent9780b150c837b5363d1e5b7a64befcbfd7e26e01 (diff)
Merge "Fix deploy settings bash output"
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-xci/deploy.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 18f96319..6b38c336 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -158,7 +158,7 @@ parse_inventory_file() {
node_total=$node_count
- if [[ "$node_total" -lt 5 && ( ha_enabled == "TRUE" || "$ha_enabled" == "true" ) ]]; then
+ if [[ "$node_total" -lt 5 && "$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
@@ -835,7 +835,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" || "$ha_enabled" == "true" ]]; then
+ if [[ "$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"
@@ -856,7 +856,7 @@ function undercloud_prep_overcloud_deploy {
DEPLOY_OPTIONS+=" -e network-environment.yaml"
fi
- if [[ "$ha_enabled" == "TRUE" || "$ha_enabled" == "true" ]] || [[ "$net_isolation_enabled" == "TRUE" ]]; then
+ if [[ "$ha_enabled" == "True" ]] || [[ "$net_isolation_enabled" == "TRUE" ]]; then
DEPLOY_OPTIONS+=" --ntp-server $ntp_server"
fi
@@ -1108,7 +1108,7 @@ parse_cmdline() {
shift 1
;;
--no-ha )
- ha_enabled="FALSE"
+ ha_enabled="False"
vm_index=1
echo "HA Deployment Disabled"
shift 1