Merge "create missing apache2 directory on Debian/Ubuntu"

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*

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*