From a2cf2d469f28a176cd405015921b2a5d43445c02 Mon Sep 17 00:00:00 2001 From: Lukas Bezdicka Date: Thu, 13 Apr 2017 19:31:29 +0200 Subject: Touch /etc/httpd/conf.d/ssl.conf To ensure that yum update passes without issues we touch ssl.conf. Proper fix is https://review.openstack.org/#/c/456712/ Depends-On: Ic5a0719f67d3795a9edca25284d1cf6f088073e8 Closes-Bug: #1682448 Resolves: rhbz#1441977 Change-Id: I73e5272c64df4aa5900f544a5d9f0670544ca679 --- extraconfig/tasks/yum_update.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh index 3bf72f14..47629ccf 100755 --- a/extraconfig/tasks/yum_update.sh +++ b/extraconfig/tasks/yum_update.sh @@ -52,6 +52,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" && \ -- cgit 1.2.3-korg