diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-20 11:20:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-20 11:20:07 +0000 |
| commit | 0b45668ffc401c98740102662f4a73a88f684f98 (patch) | |
| tree | c982ac2d5c3b387fe0981fbd733427a2a68e5aea | |
| parent | 8c86ce42ce26299c3af8f54df52f04c7d6a9e34f (diff) | |
| parent | a2cf2d469f28a176cd405015921b2a5d43445c02 (diff) | |
Merge "Touch /etc/httpd/conf.d/ssl.conf" into stable/ocata
| -rwxr-xr-x | extraconfig/tasks/yum_update.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index 20a5b658..f7e2769b 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -60,6 +60,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" && \ |