From dd42fe9555f2fd7dc772fdca8e834b2b6d73f6f7 Mon Sep 17 00:00:00 2001 From: marios Date: Tue, 9 May 2017 14:26:56 +0300 Subject: [PATCH] [Newton only] - Manually touch ssl.conf before installing mod_ssl In I49bd6f0017048fbab8a4011d5d7c3ffc6cda85b6 we added manual install of mod_ssl during the mitaka to newton upgrade for the related bug below. However we also need to prevent that package from creating the default ssl.conf with the Listen 443 as discussed in that bug. Related-Bug: 1682448 Depends-On: Ie6e19cc838a3f45100f6c98a350bdf6a37d40590 Change-Id: I04b8ccf8b8637b7b4fcc0c6182ef6cd3e30a8569 --- extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh index 63ac0a22bc..9d9b445f97 100755 --- a/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh +++ b/extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh @@ -104,6 +104,11 @@ special_case_ovs_upgrade_if_needed yum -y install python-zaqarclient # needed for os-collect-config yum -y -q update + +# Hack around mod_ssl and ssl.conf - we want mod_ssl but we need to prevent +# packaging from configuring ssl.conf (puppet does that later) +# https://bugs.launchpad.net/tripleo/+bug/1682448 +touch /etc/httpd/conf.d/ssl.conf yum install -y mod_ssl # We need to ensure at least those two configuration settings, otherwise