Merge "Touch /etc/httpd/conf.d/ssl.conf" into stable/newton

This commit is contained in:
Jenkins 2017-05-03 15:06:55 +00:00 committed by Gerrit Code Review
commit f0cbf624a3
1 changed files with 4 additions and 0 deletions

View File

@ -55,6 +55,10 @@ if hiera -c /etc/puppet/hiera.yaml service_names | grep -q pacemaker; then
pacemaker_status=$(systemctl is-active pacemaker)
fi
# TODO: FIXME: remove this in Pike.
# Hack around mod_ssl update and puppet https://bugs.launchpad.net/tripleo/+bug/1682448
touch /etc/httpd/conf.d/ssl.conf
# Fix the redis/rabbit resource start/stop timeouts. See https://bugs.launchpad.net/tripleo/+bug/1633455
# and https://bugs.launchpad.net/tripleo/+bug/1634851
if [[ "$pacemaker_status" == "active" && \