diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-10-04 11:26:41 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-01-04 18:58:09 +0000 |
| commit | 3e020fdf2a26ad640a56134c25a5060c48bb190b (patch) | |
| tree | 29cfd7e1fdd2c86a8c388b9feae2bce6c12f5abd | |
| parent | abeb5eaf4144284c22b0da6f3161d0b6550c3bbc (diff) | |
| download | kolla-3e020fdf2a26ad640a56134c25a5060c48bb190b.tar.gz kolla-3e020fdf2a26ad640a56134c25a5060c48bb190b.zip | |
Fix Freezer & Cyborg API startup on CentOS9.3.0
Affects: Ussuri, Train
As part of the CentOS 8 support, we added a kolla_httpd_setup script,
however this was not used for Cyborg or Freezer. This has been fixed
since Victoria as part of commit
032804e5a0ddf89f7726880d1b57dd492d7d5c07, but this was not backported to
Ussuri.
Closes-Bug: #1909981
Co-Authored-By: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Change-Id: I88e5bcf35207670b8611aeee3072215a7d7eb6e5
(cherry picked from commit e0d8772efa25b478467afcd3e2ecf2643ea471ff)
| -rw-r--r-- | docker/cyborg/cyborg-api/extend_start.sh | 9 | ||||
| -rwxr-xr-x | docker/freezer/freezer-api/extend_start.sh | 9 |
2 files changed, 2 insertions, 16 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 diff --git a/docker/freezer/freezer-api/extend_start.sh b/docker/freezer/freezer-api/extend_start.sh index c6c096062..6070429b2 100755 --- a/docker/freezer/freezer-api/extend_start.sh +++ b/docker/freezer/freezer-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 |