Skip to content
Snippets Groups Projects
Commit 637f8f9c authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Fix bad apache2 close"

parents 82581435 28cc39e2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
docker/horizon/extend_start.sh
+ 5
− 8
View file @ 637f8f9c
#!/bin/bash #!/bin/bash
if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ # NOTE(pbourke): httpd will not clean up after itself in some cases which
"${KOLLA_BASE_DISTRO}" == "debian" ]]; then # results in the container not being able to restart. (bug #1489676, 1557036)
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
# Loading Apache2 ENV variables # Loading Apache2 ENV variables
source /etc/apache2/envvars source /etc/apache2/envvars
fi rm -rf /var/run/apache2/*
else
# NOTE(pbourke): httpd will not clean up after itself in some cases which
# results in the container not being able to restart. Unconfirmed if this
# happens on Ubuntu. (bug #1489676)
if [[ "${KOLLA_BASE_DISTRO}" =~ fedora|centos|oraclelinux|rhel ]]; then
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
fi fi
......
docker/keystone/extend_start.sh
+ 5
− 9
View file @ 637f8f9c
#!/bin/bash #!/bin/bash
if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ # NOTE(pbourke): httpd will not clean up after itself in some cases which
"${KOLLA_BASE_DISTRO}" == "debian" ]]; then # results in the container not being able to restart. (bug #1489676, 1557036)
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
# Loading Apache2 ENV variables # Loading Apache2 ENV variables
source /etc/apache2/envvars source /etc/apache2/envvars
rm -rf /var/run/apache2/*
APACHE_DIR="apache2" APACHE_DIR="apache2"
else else
APACHE_DIR="httpd"
fi
# NOTE(pbourke): httpd will not clean up after itself in some cases which
# results in the container not being able to restart. Unconfirmed if this
# happens on Ubuntu. (bug #1489676)
if [[ "${KOLLA_BASE_DISTRO}" =~ fedora|centos|oraclelinux|rhel ]]; then
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
APACHE_DIR="httpd"
fi fi
# Create log dir for Keystone logs # Create log dir for Keystone logs
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment