diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-20 11:26:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-20 11:26:43 +0000 |
| commit | 27b1dada01adc75e78549012e8d89fe12a637d6d (patch) | |
| tree | 0ce5c156b200307528bbddb8e51999972bc3167c | |
| parent | fb0aa718557124ac2fffa112ab26dd5f1ae6247e (diff) | |
| parent | e2c7e2512a3e2373d4f92ec5bdd8152ce152ff0b (diff) | |
| download | kolla-27b1dada01adc75e78549012e8d89fe12a637d6d.tar.gz kolla-27b1dada01adc75e78549012e8d89fe12a637d6d.zip | |
Merge "Add missing cleanup step for new apache images"
| -rw-r--r-- | docker/cinder/cinder-api/extend_start.sh | 7 | ||||
| -rwxr-xr-x | docker/freezer/freezer-api/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-pxe/extend_start.sh | 10 | ||||
| -rw-r--r-- | docker/keystone/keystone/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/nova/nova-api/extend_start.sh | 13 |
5 files changed, 27 insertions, 7 deletions
diff --git a/docker/cinder/cinder-api/extend_start.sh b/docker/cinder/cinder-api/extend_start.sh index d6709fd59..a92cd0134 100644 --- a/docker/cinder/cinder-api/extend_start.sh +++ b/docker/cinder/cinder-api/extend_start.sh @@ -8,14 +8,15 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -if [[ "${KOLLA_INSTALL_TYPE}" == "binary" ]]; then +# 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/* - APACHE_DIR="apache2" else rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* - APACHE_DIR="httpd" fi fi diff --git a/docker/freezer/freezer-api/extend_start.sh b/docker/freezer/freezer-api/extend_start.sh index d12b6b7d4..9ce14e504 100755 --- a/docker/freezer/freezer-api/extend_start.sh +++ b/docker/freezer/freezer-api/extend_start.sh @@ -11,8 +11,6 @@ if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then # Loading Apache2 ENV variables . /etc/apache2/envvars rm -rf /var/run/apache2/* - APACHE_DIR="apache2" else rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* - APACHE_DIR="httpd" fi diff --git a/docker/ironic/ironic-pxe/extend_start.sh b/docker/ironic/ironic-pxe/extend_start.sh index 2496c61f7..6957ec777 100644 --- a/docker/ironic/ironic-pxe/extend_start.sh +++ b/docker/ironic/ironic-pxe/extend_start.sh @@ -13,3 +13,13 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then done exit 0 fi + +# 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 diff --git a/docker/keystone/keystone/extend_start.sh b/docker/keystone/keystone/extend_start.sh index b29bf02a3..cd8a75635 100644 --- a/docker/keystone/keystone/extend_start.sh +++ b/docker/keystone/keystone/extend_start.sh @@ -17,10 +17,8 @@ if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then # Loading Apache2 ENV variables . /etc/apache2/envvars rm -rf /var/run/apache2/* - APACHE_DIR="apache2" else rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* - APACHE_DIR="httpd" fi # Create log dir for Keystone logs 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 |