Commit 3fd75d2d authored by Dan Radez's avatar Dan Radez
Browse files

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
parent 347201e1
...@@ -25,6 +25,7 @@ set -e ...@@ -25,6 +25,7 @@ set -e
#green=`tput setaf 2` #green=`tput setaf 2`
vm_index=4 vm_index=4
ha_enabled="TRUE"
declare -i CNT declare -i CNT
declare UNDERCLOUD declare UNDERCLOUD
...@@ -250,7 +251,7 @@ ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "cat /home/stack/.ssh/id_rsa.pub" >> ...@@ -250,7 +251,7 @@ ssh -T ${SSH_OPTIONS[@]} "root@$UNDERCLOUD" "cat /home/stack/.ssh/id_rsa.pub" >>
##params: none ##params: none
function undercloud_prep_overcloud_deploy { function undercloud_prep_overcloud_deploy {
# check if HA is enabled # 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+=" --control-scale 3 --compute-scale 2"
DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml" DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml"
DEPLOY_OPTIONS+=" --ntp-server pool.ntp.org" DEPLOY_OPTIONS+=" --ntp-server pool.ntp.org"
...@@ -320,7 +321,7 @@ parse_cmdline() { ...@@ -320,7 +321,7 @@ parse_cmdline() {
shift 2 shift 2
;; ;;
-n|--no-ha ) -n|--no-ha )
vm_index=1 ha_enabled="FALSE"
shift 1 shift 1
;; ;;
*) *)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment