openstack/kolla
Code Issues Proposed changes

Add missing cleanup step for new apache images

Browse Source 
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
This commit is contained in:
Martin André 2017-04-04 10:30:24 +02:00
parent bf84c20e8f
commit e2c7e2512a
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/cinder/cinder-api/extend_start.sh
View File

@ -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

2
docker/freezer/freezer-api/extend_start.sh
View File

@ -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

10
docker/ironic/ironic-pxe/extend_start.sh
View File

@ -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

2
docker/keystone/keystone/extend_start.sh
View File

@ -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

13
docker/nova/nova-api/extend_start.sh
View File

@ -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