From cefc023878371c46ec2cd3e0176c3f25c28c1906 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Tue, 15 Dec 2015 10:52:27 -0500
Subject: fixing disabling l3 HA neutron option and removing duplicate ntp
 option

Change-Id: I6e3a4266be28b0f661e4b8e818c616000060905b
---
 ci/deploy.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'ci')

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 1c0d012c..88a6a9b1 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -470,15 +470,17 @@ function undercloud_prep_overcloud_deploy {
 ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" "openstack undercloud install > apex-undercloud-install.log"
 
   # check if HA is enabled
-  if [ $ha_enabled == "TRUE" ]; then
+  if [[ "$ha_enabled" == "TRUE" ]]; then
      DEPLOY_OPTIONS+=" --control-scale 3 --compute-scale 2"
      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml"
-     DEPLOY_OPTIONS+=" --ntp-server $ntp_server"
   fi
 
-  if [ $net_isolation_enabled == "TRUE" ]; then
+  if [[ "$net_isolation_enabled" == "TRUE" ]]; then
      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml"
      DEPLOY_OPTIONS+=" -e network-environment.yaml"
+  fi
+
+  if [[ "$ha_enabled" == "TRUE" ]] || [[ $net_isolation_enabled == "TRUE" ]]; then
      DEPLOY_OPTIONS+=" --ntp-server $ntp_server"
   fi
 
-- 
cgit 1.2.3-korg