diff options
| author |   Dan Radez <dradez@redhat.com> | 2017-01-09 14:23:37 -0500 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2017-02-22 09:44:00 -0500 |
| commit | e1a633529c06a63f9c710317f25e63b8bd574812 (patch) | |
| tree | 45a1be116c6d637e506f2c476ad04d2df76a9d81 /lib | |
| parent | 1cc0506020c9337dd5d47a7da5c69a5045b4f0fa (diff) | |
Adding congress support back into Danube
opnfv-tht-pr: 97
opnfv-puppet-tripleo-pr: 10
Change-Id: Idfc109fc984f20b096a23d12864a027146a9c74c
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 5 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index c28c7b0b..60aadd6c 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -58,6 +58,11 @@ function overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/enable_tacker.yaml" fi + # Enable Congress + if [ "${deploy_options_array['congress']}" == 'True' ]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/enable_congress.yaml" + fi + # Make sure the correct overcloud image is available if [ ! -f $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then echo "${red} $IMAGES/overcloud-full-${SDN_IMAGE}.qcow2 is required to execute your deployment." diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index b7235952..22d7c20d 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -129,9 +129,7 @@ if [ "${deploy_options_array['dataplane']}" == 'fdio' ] || [ "${deploy_options_a done fi -# TODO: Change this back to True once everything is back in -# place with tht and puppet-congress for deployment -if [ "${deploy_options_array['congress']}" == 'NeverTrue' ]; then +if [ "${deploy_options_array['congress']}" == 'True' ]; then ds_configs="--config username=\$OS_USERNAME --config tenant_name=\$OS_TENANT_NAME --config password=\$OS_PASSWORD @@ -268,8 +266,6 @@ if [[ "$ha_enabled" == 'True' ]]; then echo "${blue}\nChecking pacemaker service status\n${reset}" fi overcloud_connect "controller0" "for i in \$(sudo pcs status | grep '^* ' | cut -d ' ' -f 2 | cut -d '_' -f 1 | uniq); do echo \"WARNING: Service: \$i not running\"; done" - # trozet disable congress in HA until congress bugs are fixed - overcloud_connect "controller0" "sudo pcs resource ban openstack-congress overcloud-controller-1; sudo pcs resource ban openstack-congress overcloud-controller-2; sudo systemctl restart openstack-congress" fi if [ "${deploy_options_array['vpn']}" == 'True' ]; then |