diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index a08739ab..0c3f9d44 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -20,6 +20,8 @@ function overcloud_deploy { DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml" elif [ "${deploy_options_array['vpp']}" == 'True' ]; then DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_fdio.yaml" + elif [ "${deploy_options_array['vpn']}" == 'true' ]; then + DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml" else DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml" fi @@ -199,6 +201,10 @@ fi source stackrc set -o errexit +# Workaround for APEX-207 where sometimes swift proxy is down +if ! sudo systemctl status openstack-swift-proxy > /dev/null; then + sudo systemctl restart openstack-swift-proxy +fi echo "Uploading overcloud glance images" openstack overcloud image upload |