openstack/kolla
Code Issues Proposed changes

Merge "create missing apache2 directory on Debian/Ubuntu"

Browse Source
This commit is contained in:
Zuul 2019-05-28 08:27:24 +00:00 committed by Gerrit Code Review
commit 554a521d6e
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/horizon/extend_start.sh
View File

@ -349,6 +349,7 @@ config_zun_dashboard
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
# Loading Apache2 ENV variables # Loading Apache2 ENV variables
. /etc/apache2/envvars . /etc/apache2/envvars
install -d /var/run/apache2/
rm -rf /var/run/apache2/* rm -rf /var/run/apache2/*
else else
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*

1
docker/placement/placement-api/extend_start.sh
View File

@ -25,6 +25,7 @@ fi
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
# Loading Apache2 ENV variables # Loading Apache2 ENV variables
. /etc/apache2/envvars . /etc/apache2/envvars
install -d /var/run/apache2/
rm -rf /var/run/apache2/* rm -rf /var/run/apache2/*
else else
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*