Skip to content

Commit e0d8772

Browse files
yoctozeptomarkgoddard
authored andcommitted
Fix Freezer & Cyborg API startup on CentOS
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 032804e, but this was not backported to Ussuri. Closes-Bug: #1909981 Co-Authored-By: Radosław Piliszek <[email protected]> Change-Id: I88e5bcf35207670b8611aeee3072215a7d7eb6e5
1 parent 9afa9aa commit e0d8772

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

docker/cyborg/cyborg-api/extend_start.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
77
exit 0
88
fi
99

10-
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
11-
# Loading Apache2 ENV variables
12-
. /etc/apache2/envvars
13-
install -d /var/run/apache2/
14-
rm -rf /var/run/apache2/*
15-
else
16-
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
17-
fi
10+
. /usr/local/bin/kolla_httpd_setup

docker/freezer/freezer-api/extend_start.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,4 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
77
exit 0
88
fi
99

10-
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
11-
# Loading Apache2 ENV variables
12-
. /etc/apache2/envvars
13-
install -d /var/run/apache2/
14-
rm -rf /var/run/apache2/*
15-
else
16-
rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd*
17-
fi
10+
. /usr/local/bin/kolla_httpd_setup

0 commit comments

Comments
 (0)