From a0e8c7e3764b168eaaa82d17d965f62d34766573 Mon Sep 17 00:00:00 2001
From: Chris Friesen <chris.friesen@windriver.com>
Date: Wed, 28 Nov 2018 01:33:39 -0500
Subject: [PATCH 02] Remove stale Apache2 service pids when a POD starts.

Stale Apache2 pids will prevent Apache2 from starting and will leave
the POD in a crashed state.

Note: the pid file is somewhat confusingly called
/var/run/httpd/httpd.pid and /var/run/apache2 is just a symlink to
/var/run/httpd.

This is loosely based off the in-review upstream commit at
https://review.openstack.org/#/c/619747

Signed-off-by: Robert Church <robert.church@windriver.com>
---
 ceilometer/templates/bin/_ceilometer-api.sh.tpl | 3 +++
 keystone/templates/bin/_keystone-api.sh.tpl     | 6 ++----
 nova/templates/bin/_nova-placement-api.sh.tpl   | 3 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ceilometer/templates/bin/_ceilometer-api.sh.tpl b/ceilometer/templates/bin/_ceilometer-api.sh.tpl
index 25b2f9e..3870b4e 100644
--- a/ceilometer/templates/bin/_ceilometer-api.sh.tpl
+++ b/ceilometer/templates/bin/_ceilometer-api.sh.tpl
@@ -42,6 +42,9 @@ function start () {
     fi
   fi
 
+  # Get rid of stale pid file if present.
+  rm -f /var/run/apache2/*.pid
+
   # Start Apache2
   exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }}
 }
diff --git a/keystone/templates/bin/_keystone-api.sh.tpl b/keystone/templates/bin/_keystone-api.sh.tpl
index 384ee8b..4c72310 100644
--- a/keystone/templates/bin/_keystone-api.sh.tpl
+++ b/keystone/templates/bin/_keystone-api.sh.tpl
@@ -43,10 +43,8 @@ function start () {
      source /etc/apache2/envvars
   fi
 
-  if [ -f /var/run/apache2/apache2.pid ]; then
-     # Remove the stale pid for debian/ubuntu images
-     rm -f /var/run/apache2/apache2.pid
-  fi
+  # Get rid of stale pid, shared memory segment and wsgi sock files if present.
+  rm -f /var/run/apache2/*
 
   # Start Apache2
   exec {{ .Values.conf.software.apache2.binary }} {{ .Values.conf.software.apache2.start_parameters }}
diff --git a/nova/templates/bin/_nova-placement-api.sh.tpl b/nova/templates/bin/_nova-placement-api.sh.tpl
index bc15a37..055d079 100644
--- a/nova/templates/bin/_nova-placement-api.sh.tpl
+++ b/nova/templates/bin/_nova-placement-api.sh.tpl
@@ -33,6 +33,9 @@ function start () {
      fi
   fi
 
+  # Get rid of stale pid file if present.
+  rm -f /var/run/apache2/*.pid
+
   # Start Apache2
   {{- if .Values.conf.software.apache2.a2enmod }}
     {{- range .Values.conf.software.apache2.a2enmod }}
-- 
2.7.4