From: Dan Radez <dradez@redhat.com>
Date: Mon, 9 Nov 2015 22:06:24 +0000 (-0500)
Subject: fixing non-ha deploy
X-Git-Tag: brahmaputra.1.rc0~48
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3fd75d2d98efe8c3a38f50559fcf36f686e11584;p=apex.git

fixing non-ha deploy

The instackenv has 5 nodes in it but we were only putting two
back into the pool. This patch puts all 5 back in the pool
but doesn't throw the ha flags

JIRA: APEX-45

Change-Id: I1c539eafca9ed2f674a1a954f75c175fe9efc5bb
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 153ce339..1a94345e 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -25,6 +25,7 @@ set -e
 #green=`tput setaf 2`
 
 vm_index=4
+ha_enabled="TRUE"
 declare -i CNT
 declare UNDERCLOUD
 
@@ -250,7 +251,7 @@ ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "cat /home/stack/.ssh/id_rsa.pub" >>
 ##params: none
 function undercloud_prep_overcloud_deploy {
   # check if HA is enabled
-  if [ "$vm_index" -gt 1 ]; 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 pool.ntp.org"
@@ -320,7 +321,7 @@ parse_cmdline() {
                 shift 2
             ;;
         -n|--no-ha )
-                vm_index=1
+		ha_enabled="FALSE"
                 shift 1
            ;;
         *)