From 28cc39e2fee14d58831e49458a66d6da0a4cd406 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Mon, 21 Mar 2016 18:56:52 +0000 Subject: [PATCH] Fix bad apache2 close Change-Id: Id19450a566da1bf7b824f0050e7c3e3f73581a9b Closes-Bug: #1557036 --- docker/horizon/extend_start.sh | 13 +++++-------- docker/keystone/extend_start.sh | 14 +++++--------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index fe58e023f2..299e9379cc 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -1,15 +1,12 @@ #!/bin/bash -if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ - "${KOLLA_BASE_DISTRO}" == "debian" ]]; then +# NOTE(pbourke): httpd will not clean up after itself in some cases which +# results in the container not being able to restart. (bug #1489676, 1557036) +if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then # Loading Apache2 ENV variables source /etc/apache2/envvars -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/apache2/* +else rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* fi diff --git a/docker/keystone/extend_start.sh b/docker/keystone/extend_start.sh index 5dd166534f..672e92b539 100644 --- a/docker/keystone/extend_start.sh +++ b/docker/keystone/extend_start.sh @@ -1,19 +1,15 @@ #!/bin/bash -if [[ "${KOLLA_BASE_DISTRO}" == "ubuntu" || \ - "${KOLLA_BASE_DISTRO}" == "debian" ]]; then +# NOTE(pbourke): httpd will not clean up after itself in some cases which +# results in the container not being able to restart. (bug #1489676, 1557036) +if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then # Loading Apache2 ENV variables source /etc/apache2/envvars + rm -rf /var/run/apache2/* APACHE_DIR="apache2" 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* + APACHE_DIR="httpd" fi # Create log dir for Keystone logs