Fix deploy settings bash output

Change-Id: I61efdac14066d2a3d7c3e3ff7f93f0fa2af3a857
Signed-off-by: Feng Pan <fpan@redhat.com>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 18f9631..6b38c33 100755 (executable)
--- 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

diff --git a/lib/python/apex/deploy_env.py b/lib/python/apex/deploy_env.py
index 5c73324..be8779a 100644 (file)
--- a/lib/python/apex/deploy_env.py
+++ b/lib/python/apex/deploy_env.py
@@ -129,7 +129,7 @@ class DeploySettings:
         """
         bash_str = ''
         for key, value in self.deploy_settings['global_params'].items():
-            bash_str += "if [ -z \"$(eval echo \$${})\" ]; then\n{}={}\nfi\n".format(key,key, value)
+            bash_str += "{}={}\n".format(key, value)
         if 'performance' in self.deploy_settings['deploy_options']:
             bash_str += self._dump_performance()
         bash_str += self._dump_deploy_options_array()