From 6ef631d229eb545246776c0618573daefc8f85bc Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Tue, 10 Dec 2019 11:51:51 +0000
Subject: Refactor Apache httpd setup

All Apache httpd setup has been moved to a new helper script,
kolla_httpd_setup. This includes the existing clean of /run/httpd,
/var/run/httpd, /tmp/httpd etc.

Horizon has an additional bit of Apache config for Debian/binary, which
has been kept in extend_start.sh for horizon.

Change-Id: Ia2af74b69c151db0bd7e452460b0babcee50b282
Related: blueprint centos-rhel-8
(cherry picked from commit 8484190e77e4237247dac7fba128e5a111fc9918)
---
 docker/keystone/keystone/extend_start.sh | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'docker/keystone')

diff --git a/docker/keystone/keystone/extend_start.sh b/docker/keystone/keystone/extend_start.sh
index be6a0e1de..e428fc95e 100644
--- a/docker/keystone/keystone/extend_start.sh
+++ b/docker/keystone/keystone/extend_start.sh
@@ -1,16 +1,5 @@
 #!/bin/bash
 
-# NOTE(pbourke): httpd will not clean up after itself in some cases which
-# results in the container not being able to restart. (bug #1489676, 1557036)
-if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
-    # Loading Apache2 ENV variables
-    . /etc/apache2/envvars
-    install -d /var/run/apache2/
-    rm -rf /var/run/apache2/*
-else
-    rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
-fi
-
 # Create log dir for Keystone logs
 KEYSTONE_LOG_DIR="/var/log/kolla/keystone"
 if [[ ! -d "${KEYSTONE_LOG_DIR}" ]]; then
@@ -56,4 +45,6 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     exit 0
 fi
 
+. /usr/local/bin/kolla_httpd_setup
+
 ARGS="-DFOREGROUND"
-- 
cgit v1.2.3