diff options
| author | Martin André <m.andre@redhat.com> | 2017-04-04 10:30:24 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2017-04-20 10:17:38 +0200 |
| commit | e2c7e2512a3e2373d4f92ec5bdd8152ce152ff0b (patch) | |
| tree | 73767d7f6e77ad71b5d34a674b91df2d45068f01 /docker/nova | |
| parent | bf84c20e8f7b9eed03275ece9d492492e2c00c62 (diff) | |
| download | kolla-e2c7e2512a3e2373d4f92ec5bdd8152ce152ff0b.tar.gz kolla-e2c7e2512a3e2373d4f92ec5bdd8152ce152ff0b.zip | |
Add missing cleanup step for new apache images
A few new images got apache as part of blueprint
apache-packages-for-apis without a cleaning up. Without this step the
containers may fail to restart due to runtime files already present.
This commit fixes it for all images with the exception of heat-base so
that it can be cleanly backported to stable/ocata.
It also removes the unused APACHE_DIR variable from freezer-api and
keystone extend_start.sh script.
Change-Id: I47d75221b3d1aae91f11d3e0da83e221a00315b7
Closes-Bug: #1679565
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-api/extend_start.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/docker/nova/nova-api/extend_start.sh b/docker/nova/nova-api/extend_start.sh index 6878a7672..f820dfa97 100644 --- a/docker/nova/nova-api/extend_start.sh +++ b/docker/nova/nova-api/extend_start.sh @@ -8,3 +8,16 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then nova-manage db online_data_migrations exit 0 fi + +# Assume the service runs on top of Apache when user is root +if [[ $USER == 'root' ]]; 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 + . /etc/apache2/envvars + rm -rf /var/run/apache2/* + else + rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* + fi +fi |