aboutsummaryrefslogtreecommitdiff
path: root/docker/horizon
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-10-04 11:26:41 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-10-05 13:03:39 +0200
commit032804e5a0ddf89f7726880d1b57dd492d7d5c07 (patch)
treec85d1b7bb91ddbc9c97095a124b9324403aef178 /docker/horizon
parent1666ee5b768fee7075e59c2a1409a4bee43e8b5b (diff)
downloadkolla-032804e5a0ddf89f7726880d1b57dd492d7d5c07.tar.gz
kolla-032804e5a0ddf89f7726880d1b57dd492d7d5c07.zip
Be strict about errors in start
Make start.sh run with pipefail and nounset to avoid common errors in the start scripts and detect them early. Httpd code had to be patched to allow it to pass on Debuntu. Also fix the two missed applications of httpd to make sure all its path are covered. And also fix Horizon's ENABLE_ZAQAR - K-A does not use Zaqar. Yet another - Horizon's settings_bundle. :-) Finally, fix Neutron for Debuntu (KOLLA_LEGACY_IPTABLES). Change-Id: I39b8d78f6758df1f92b8b0d2c06ea99b038b843b Depends-On: https://review.opendev.org/711923
Diffstat (limited to 'docker/horizon')
-rw-r--r--docker/horizon/extend_start.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 01549598e..8709ad1f6 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -285,6 +285,11 @@ function config_watcher_dashboard {
}
function config_zaqar_dashboard {
+ # NOTE(yoctozepto): Kolla-Ansible does not control Zaqar and therefore
+ # does not set ENABLE_ZAQAR; the workaround below ensures it gets set to
+ # `no` in that case to fix this code under `set -o nounset`.
+ ENABLE_ZAQAR=${ENABLE_ZAQAR-no}
+
for file in ${SITE_PACKAGES}/zaqar_ui/enabled/_*[^__].py; do
config_dashboard "${ENABLE_ZAQAR}" \
"${SITE_PACKAGES}/zaqar_ui/enabled/${file##*/}" \
@@ -304,10 +309,12 @@ function config_zun_dashboard {
# changed. Use a static modification date when generating the tarball
# so that we only trigger on content changes.
function settings_bundle {
+ # NOTE(yoctozepto): We ignore errors here (|| true) to make it work with
+ # `set -o pipefail` (files might be missing - no problem).
tar -cf- --mtime=1970-01-01 \
/etc/openstack-dashboard/local_settings \
/etc/openstack-dashboard/custom_local_settings \
- /etc/openstack-dashboard/local_settings.d 2> /dev/null
+ /etc/openstack-dashboard/local_settings.d 2> /dev/null || true
}
function settings_changed {