From dfa4a53db9c114417afab3ad1034571ab189f22d Mon Sep 17 00:00:00 2001
From: Oleh Hryhorov <ohryhorov@mirantis.com>
Date: Tue, 25 Jun 2019 15:32:28 +0300
Subject: [PATCH] Create ${APACHE_RUN_DIR} if libapache2-mod-wsgi-py3 module is
 installed

The aim of the patch is to creating directory from ${APACHE_RUN_DIR}
variable for:

* aodh
* ceilometer
* horizon
* panko

If an image is built with python3 therefore libapache2-mod-wsgi-py3 module
has to be installed accordingly but the module doesn't create /var/run/apache2
directory which is APACHE_RUN_DIR in apache configuration file so apache can't
start without it due to the fact that the directory is used to make there pid,
run, etc files.

Change-Id: Id511a07fca3eec9b5e80f2f9413628ab4d42d61b
---
 aodh/templates/bin/_aodh-api.sh.tpl             | 5 +++++
 ceilometer/templates/bin/_ceilometer-api.sh.tpl | 5 +++++
 horizon/templates/bin/_horizon.sh.tpl           | 5 +++++
 panko/templates/bin/_panko-api.sh.tpl           | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/aodh/templates/bin/_aodh-api.sh.tpl b/aodh/templates/bin/_aodh-api.sh.tpl
index 4ec8291e86..d42183a58d 100644
--- a/aodh/templates/bin/_aodh-api.sh.tpl
+++ b/aodh/templates/bin/_aodh-api.sh.tpl
@@ -27,6 +27,11 @@ function start () {
   if [ -f /etc/apache2/envvars ]; then
     # Loading Apache2 ENV variables
     source /etc/apache2/envvars
+    # The directory below has to be created due to the fact that
+    # libapache2-mod-wsgi-py3 doesn't create it in contrary by libapache2-mod-wsgi
+    if [ ! -d ${APACHE_RUN_DIR} ]; then
+       mkdir -p ${APACHE_RUN_DIR}
+    fi
   fi
 
   # Get rid of stale pid file if present.
diff --git a/ceilometer/templates/bin/_ceilometer-api.sh.tpl b/ceilometer/templates/bin/_ceilometer-api.sh.tpl
index de3a742cfa..25b2f9e0b2 100644
--- a/ceilometer/templates/bin/_ceilometer-api.sh.tpl
+++ b/ceilometer/templates/bin/_ceilometer-api.sh.tpl
@@ -35,6 +35,11 @@ function start () {
   if [ -f /etc/apache2/envvars ]; then
     # Loading Apache2 ENV variables
     source /etc/apache2/envvars
+    # The directory below has to be created due to the fact that
+    # libapache2-mod-wsgi-py3 doesn't create it in contrary by libapache2-mod-wsgi
+    if [ ! -d ${APACHE_RUN_DIR} ]; then
+       mkdir -p ${APACHE_RUN_DIR}
+    fi
   fi
 
   # Start Apache2
diff --git a/horizon/templates/bin/_horizon.sh.tpl b/horizon/templates/bin/_horizon.sh.tpl
index 000bcbfe53..6aabad34e6 100644
--- a/horizon/templates/bin/_horizon.sh.tpl
+++ b/horizon/templates/bin/_horizon.sh.tpl
@@ -42,6 +42,11 @@ function start () {
   if [ -f /etc/apache2/envvars ]; then
      # Loading Apache2 ENV variables
      source /etc/apache2/envvars
+     # The directory below has to be created due to the fact that
+     # libapache2-mod-wsgi-py3 doesn't create it in contrary by libapache2-mod-wsgi
+     if [ ! -d ${APACHE_RUN_DIR} ]; then
+        mkdir -p ${APACHE_RUN_DIR}
+     fi
   fi
   rm -rf /var/run/apache2/*
   APACHE_DIR="apache2"
diff --git a/panko/templates/bin/_panko-api.sh.tpl b/panko/templates/bin/_panko-api.sh.tpl
index 39488edb6e..227009e975 100644
--- a/panko/templates/bin/_panko-api.sh.tpl
+++ b/panko/templates/bin/_panko-api.sh.tpl
@@ -27,6 +27,11 @@ function start () {
   if [ -f /etc/apache2/envvars ]; then
      # Loading Apache2 ENV variables
      source /etc/apache2/envvars
+     # The directory below has to be created due to the fact that
+     # libapache2-mod-wsgi-py3 doesn't create it in contrary by libapache2-mod-wsgi
+     if [ ! -d ${APACHE_RUN_DIR} ]; then
+        mkdir -p ${APACHE_RUN_DIR}
+     fi
   fi
 
   # Get rid of stale pid file if present.