diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-21 22:16:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-21 22:16:55 +0000 |
| commit | 637f8f9ce5b4876a2febb2175bf3eb8f3c541c29 (patch) | |
| tree | 6706ba7cc6c85d7c0ef7f9cdfa8f7f79b8ed19a0 /docker | |
| parent | 8258143542e106f0a4134c91e4419f3f77bcf54f (diff) | |
| parent | 28cc39e2fee14d58831e49458a66d6da0a4cd406 (diff) | |
| download | kolla-637f8f9ce5b4876a2febb2175bf3eb8f3c541c29.tar.gz kolla-637f8f9ce5b4876a2febb2175bf3eb8f3c541c29.zip | |
Merge "Fix bad apache2 close"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/horizon/extend_start.sh | 13 | ||||
| -rw-r--r-- | 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 fe58e023f..299e9379c 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 5dd166534..672e92b53 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 |