From 7d9cd19673e9520c181cbe4d7b83387a43a464c4 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Tue, 28 May 2019 12:01:45 +0200
Subject: create missing apache2 directory on Debian/Ubuntu

Ubuntu/source deployment of several images (horizon, placement-api, zun)
failed with:

+ exec /usr/sbin/apache2 -DFOREGROUND
apache2: Syntax error on line 80 of /etc/apache2/apache2.conf: DefaultRuntimeDir must be a valid directory, absolute or relative to ServerRoot

Change-Id: Ie2a1077f7def0743f1403341985e2109aa490026
(cherry picked from commit 932f09bcd65e15524b5229fdb6bc73a7e0111b27)
---
 docker/aodh/aodh-api/extend_start.sh             | 1 +
 docker/barbican/barbican-api/extend_start.sh     | 1 +
 docker/cinder/cinder-api/extend_start.sh         | 1 +
 docker/cloudkitty/cloudkitty-api/extend_start.sh | 1 +
 docker/crane/extend_start.sh                     | 1 +
 docker/cyborg/cyborg-api/extend_start.sh         | 1 +
 docker/freezer/freezer-api/extend_start.sh       | 1 +
 docker/gnocchi/gnocchi-api/extend_start.sh       | 1 +
 docker/heat/heat-base/extend_start.sh            | 1 +
 docker/ironic/ironic-api/extend_start.sh         | 1 +
 docker/ironic/ironic-pxe/extend_start.sh         | 1 +
 docker/keystone/keystone/extend_start.sh         | 1 +
 docker/manila/manila-api/extend_start.sh         | 1 +
 docker/mistral/mistral-api/extend_start.sh       | 1 +
 docker/monasca/monasca-api/extend_start.sh       | 1 +
 docker/monasca/monasca-log-api/extend_start.sh   | 1 +
 docker/nova/nova-api/extend_start.sh             | 1 +
 docker/octavia/octavia-api/extend_start.sh       | 1 +
 docker/panko/panko-api/extend_start.sh           | 1 +
 docker/tripleo-ui/extend_start.sh                | 1 +
 docker/vitrage/vitrage-api/extend_start.sh       | 1 +
 docker/zaqar/zaqar-wsgi/extend_start.sh          | 1 +
 docker/zun/zun-api/extend_start.sh               | 1 +
 23 files changed, 23 insertions(+)

(limited to 'docker')

diff --git a/docker/aodh/aodh-api/extend_start.sh b/docker/aodh/aodh-api/extend_start.sh
index 0826a4645..708b12ed3 100644
--- a/docker/aodh/aodh-api/extend_start.sh
+++ b/docker/aodh/aodh-api/extend_start.sh
@@ -5,6 +5,7 @@
 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*
diff --git a/docker/barbican/barbican-api/extend_start.sh b/docker/barbican/barbican-api/extend_start.sh
index 687c66ddb..920b50804 100755
--- a/docker/barbican/barbican-api/extend_start.sh
+++ b/docker/barbican/barbican-api/extend_start.sh
@@ -14,6 +14,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh
index 7fef2609b..251b9d105 100644
--- a/docker/cinder/cinder-api/extend_start.sh
+++ b/docker/cinder/cinder-api/extend_start.sh
@@ -24,6 +24,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/cloudkitty/cloudkitty-api/extend_start.sh b/docker/cloudkitty/cloudkitty-api/extend_start.sh
index 756fd82fd..e1f41b558 100644
--- a/docker/cloudkitty/cloudkitty-api/extend_start.sh
+++ b/docker/cloudkitty/cloudkitty-api/extend_start.sh
@@ -5,6 +5,7 @@
 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*
diff --git a/docker/crane/extend_start.sh b/docker/crane/extend_start.sh
index ada839e96..1277bea35 100644
--- a/docker/crane/extend_start.sh
+++ b/docker/crane/extend_start.sh
@@ -7,6 +7,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/cyborg/cyborg-api/extend_start.sh b/docker/cyborg/cyborg-api/extend_start.sh
index a96619d93..1cc72590f 100644
--- a/docker/cyborg/cyborg-api/extend_start.sh
+++ b/docker/cyborg/cyborg-api/extend_start.sh
@@ -10,6 +10,7 @@ fi
 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*
diff --git a/docker/freezer/freezer-api/extend_start.sh b/docker/freezer/freezer-api/extend_start.sh
index 9ce14e504..c6c096062 100755
--- a/docker/freezer/freezer-api/extend_start.sh
+++ b/docker/freezer/freezer-api/extend_start.sh
@@ -10,6 +10,7 @@ fi
 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*
diff --git a/docker/gnocchi/gnocchi-api/extend_start.sh b/docker/gnocchi/gnocchi-api/extend_start.sh
index e67dff0df..5059551d2 100644
--- a/docker/gnocchi/gnocchi-api/extend_start.sh
+++ b/docker/gnocchi/gnocchi-api/extend_start.sh
@@ -5,6 +5,7 @@
 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*
diff --git a/docker/heat/heat-base/extend_start.sh b/docker/heat/heat-base/extend_start.sh
index ae72de96b..5af0ef36d 100644
--- a/docker/heat/heat-base/extend_start.sh
+++ b/docker/heat/heat-base/extend_start.sh
@@ -14,6 +14,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/ironic/ironic-api/extend_start.sh b/docker/ironic/ironic-api/extend_start.sh
index ebe85b893..20811158c 100644
--- a/docker/ironic/ironic-api/extend_start.sh
+++ b/docker/ironic/ironic-api/extend_start.sh
@@ -25,6 +25,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh
index 0ba57a834..6d0234c1c 100644
--- a/docker/ironic/ironic-pxe/extend_start.sh
+++ b/docker/ironic/ironic-pxe/extend_start.sh
@@ -45,6 +45,7 @@ fi
 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*
diff --git a/docker/keystone/keystone/extend_start.sh b/docker/keystone/keystone/extend_start.sh
index 0d8d3bc43..be6a0e1de 100644
--- a/docker/keystone/keystone/extend_start.sh
+++ b/docker/keystone/keystone/extend_start.sh
@@ -5,6 +5,7 @@
 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*
diff --git a/docker/manila/manila-api/extend_start.sh b/docker/manila/manila-api/extend_start.sh
index 3e5347ac5..ea4a64f5f 100644
--- a/docker/manila/manila-api/extend_start.sh
+++ b/docker/manila/manila-api/extend_start.sh
@@ -15,6 +15,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/mistral/mistral-api/extend_start.sh b/docker/mistral/mistral-api/extend_start.sh
index 4953802b1..65e9db22c 100644
--- a/docker/mistral/mistral-api/extend_start.sh
+++ b/docker/mistral/mistral-api/extend_start.sh
@@ -15,6 +15,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/monasca/monasca-api/extend_start.sh b/docker/monasca/monasca-api/extend_start.sh
index 5ea66ca4c..f52868035 100644
--- a/docker/monasca/monasca-api/extend_start.sh
+++ b/docker/monasca/monasca-api/extend_start.sh
@@ -14,6 +14,7 @@ fi
 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*
diff --git a/docker/monasca/monasca-log-api/extend_start.sh b/docker/monasca/monasca-log-api/extend_start.sh
index bcccdf174..d343ab26a 100644
--- a/docker/monasca/monasca-log-api/extend_start.sh
+++ b/docker/monasca/monasca-log-api/extend_start.sh
@@ -7,6 +7,7 @@ SERVICE="monasca-log-api"
 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*
diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh
index 428d8945a..3d958253e 100644
--- a/docker/nova/nova-api/extend_start.sh
+++ b/docker/nova/nova-api/extend_start.sh
@@ -27,6 +27,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/octavia/octavia-api/extend_start.sh b/docker/octavia/octavia-api/extend_start.sh
index 48a6751cb..d6cacba52 100644
--- a/docker/octavia/octavia-api/extend_start.sh
+++ b/docker/octavia/octavia-api/extend_start.sh
@@ -14,6 +14,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/panko/panko-api/extend_start.sh b/docker/panko/panko-api/extend_start.sh
index 423a8e2b8..6cfb322eb 100644
--- a/docker/panko/panko-api/extend_start.sh
+++ b/docker/panko/panko-api/extend_start.sh
@@ -5,6 +5,7 @@
 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*
diff --git a/docker/tripleo-ui/extend_start.sh b/docker/tripleo-ui/extend_start.sh
index ada839e96..1277bea35 100644
--- a/docker/tripleo-ui/extend_start.sh
+++ b/docker/tripleo-ui/extend_start.sh
@@ -7,6 +7,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/vitrage/vitrage-api/extend_start.sh b/docker/vitrage/vitrage-api/extend_start.sh
index 3504f6ab2..0a6204ea5 100644
--- a/docker/vitrage/vitrage-api/extend_start.sh
+++ b/docker/vitrage/vitrage-api/extend_start.sh
@@ -5,6 +5,7 @@
 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*
diff --git a/docker/zaqar/zaqar-wsgi/extend_start.sh b/docker/zaqar/zaqar-wsgi/extend_start.sh
index ada839e96..1277bea35 100755
--- a/docker/zaqar/zaqar-wsgi/extend_start.sh
+++ b/docker/zaqar/zaqar-wsgi/extend_start.sh
@@ -7,6 +7,7 @@ if [[ "$(whoami)" == 'root' ]]; then
     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*
diff --git a/docker/zun/zun-api/extend_start.sh b/docker/zun/zun-api/extend_start.sh
index 92f669064..6136e6b24 100644
--- a/docker/zun/zun-api/extend_start.sh
+++ b/docker/zun/zun-api/extend_start.sh
@@ -5,6 +5,7 @@
 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*
-- 
cgit v1.2.3