diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-12 15:18:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-12 15:18:26 +0000 |
| commit | c41c6568b447e5170a953de50084dd99ddc22436 (patch) | |
| tree | 930f7f0670f731fa92655439d90e4d54e0d49534 /docker/cyborg | |
| parent | 524a821577d568a7a19983a7b6adc36e78fb9e4d (diff) | |
| parent | 032804e5a0ddf89f7726880d1b57dd492d7d5c07 (diff) | |
| download | kolla-c41c6568b447e5170a953de50084dd99ddc22436.tar.gz kolla-c41c6568b447e5170a953de50084dd99ddc22436.zip | |
Merge "Be strict about errors in start"
Diffstat (limited to 'docker/cyborg')
| -rw-r--r-- | docker/cyborg/cyborg-api/extend_start.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docker/cyborg/cyborg-api/extend_start.sh b/docker/cyborg/cyborg-api/extend_start.sh index e29728a96..63c62ef93 100644 --- a/docker/cyborg/cyborg-api/extend_start.sh +++ b/docker/cyborg/cyborg-api/extend_start.sh @@ -7,11 +7,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -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 +. /usr/local/bin/kolla_httpd_setup |