From bac1235ed200bb7694e286cdc80f689f25f871ef Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Wed, 11 Nov 2015 11:11:44 +0000
Subject: [PATCH] Clean up horizon httpd pid files for RPM distros

(apply same fix that we did for keystone, to horizon)

In some cases we're seeing httpd not cleaning up properly after itself,
which results in the horizon container failing to restart. This is
confirmed to happen on rpm based distros, but have not had any reports
on Ubuntu.

Change-Id: I8ece6da1a8a1180730d68be0d129a656ddcede07
Closes-Bug: #1515214
backport: liberty
---
 docker/horizon/extend_start.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 7a0bf9b55d..a82821f14f 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -5,3 +5,10 @@ if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \
     # Loading Apache2 ENV variables
     source /etc/apache2/envvars
 fi
+
+# NOTE(pbourke): httpd will not clean up after itself in some cases which
+# results in the container not being able to restart. Unconfirmed if this
+# happens on Ubuntu. (bug #1489676)
+if [[ "${KOLLA_BASE_DISTRO}" =~ fedora|centos|oraclelinux|rhel ]]; then
+    rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
+fi