diff options
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/keystone/extend_start.sh | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/docker/keystone/keystone/extend_start.sh b/docker/keystone/keystone/extend_start.sh index be6a0e1de..e428fc95e 100644 --- a/docker/keystone/keystone/extend_start.sh +++ b/docker/keystone/keystone/extend_start.sh @@ -1,16 +1,5 @@ #!/bin/bash -# 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 - install -d /var/run/apache2/ - rm -rf /var/run/apache2/* -else - rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* -fi - # Create log dir for Keystone logs KEYSTONE_LOG_DIR="/var/log/kolla/keystone" if [[ ! -d "${KEYSTONE_LOG_DIR}" ]]; then @@ -56,4 +45,6 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi +. /usr/local/bin/kolla_httpd_setup + ARGS="-DFOREGROUND" |