diff options
| author |   Dan Radez <dradez@redhat.com> | 2015-12-15 10:52:27 -0500 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2015-12-15 10:57:28 -0500 |
| commit | cefc023878371c46ec2cd3e0176c3f25c28c1906 (patch) | |
| tree | 5fd0a6949021ef87e685ca930850f2a1e02a1c33 /ci | |
| parent | c2ceba8a6e2092866a6457a3517964fd4822fb21 (diff) | |
fixing disabling l3 HA neutron option and removing duplicate ntp option
Change-Id: I6e3a4266be28b0f661e4b8e818c616000060905b
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy.sh | 8 |
1 files changed, 5 insertions, 3 deletions
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 |