aboutsummaryrefslogtreecommitdiff
path: root/docker/monasca
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-06-05 11:48:21 +0000
committerGerrit Code Review <review@openstack.org>2019-06-05 11:48:22 +0000
commit4926adb62465bf819fca2dacd42454d4e9eb74df (patch)
tree437646430b5151d97488806c92e4d73b020df5c5 /docker/monasca
parent00475feb7f62c192b6ff5f12bff1b77efd85da6f (diff)
parent932f09bcd65e15524b5229fdb6bc73a7e0111b27 (diff)
downloadkolla-4926adb62465bf819fca2dacd42454d4e9eb74df.tar.gz
kolla-4926adb62465bf819fca2dacd42454d4e9eb74df.zip
Merge "create missing apache2 directory on Debian/Ubuntu"
Diffstat (limited to 'docker/monasca')
-rw-r--r--docker/monasca/monasca-api/extend_start.sh1
-rw-r--r--docker/monasca/monasca-log-api/extend_start.sh1
2 files changed, 2 insertions, 0 deletions
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*