diff options
| author | Zuul <zuul@review.openstack.org> | 2018-05-10 18:28:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-05-10 18:28:13 +0000 |
| commit | 000159cb6d5da0fffe0ba73051c6c551a0cdd9bd (patch) | |
| tree | f1ea7b4b4314599169c550a9ce8899180b9fac58 | |
| parent | 8edf1435d310d6e5e9956dbe42f01b3f6e24fee0 (diff) | |
| parent | 479daab59b4a1faad3a4ab5b7f6ecc4887ffea3a (diff) | |
| download | kolla-000159cb6d5da0fffe0ba73051c6c551a0cdd9bd.tar.gz kolla-000159cb6d5da0fffe0ba73051c6c551a0cdd9bd.zip | |
Merge "Create symlink if /e/o-d/customer_local_settings exists"
| -rw-r--r-- | docker/horizon/extend_start.sh | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 3fc6a20c2..0c9c04637 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -15,6 +15,11 @@ if [[ ${KOLLA_INSTALL_TYPE} == "source" ]] && [[ ! -f ${SITE_PACKAGES}/openstack ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py fi +if [[ -f /etc/openstack-dashboard/custom_local_settings ]] && [[ ! -f ${SITE_PACKAGES}/openstack_dashboard/local/custom_local_settings.py ]]; then + ln -s /etc/openstack-dashboard/custom_local_settings \ + ${SITE_PACKAGES}/openstack_dashboard/local/custom_local_settings.py +fi + # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then @@ -251,6 +256,21 @@ function config_zun_dashboard { done } +# NOTE(jeffrey4l, niedbalski): The local_settings and custom_local_settings files +# affect django-compress behavior, so re-generate the compressed +# javascript and css if any of those setting files changed +function settings_changed { + declare -A settings=( ['/etc/openstack-dashboard/local_settings']="/var/lib/kolla/.local_settings.md5sum.txt" ['/etc/openstack-dashboard/custom_local_settings']="/var/lib/kolla/.custom_local_settings.md5sum.txt") + declare -x changed=1 + for path in "${!settings[@]}"; do + if [[ ! -f ${settings[$path]} || $(md5sum -c --status ${settings[$path]};echo $?) != 0 || ${FORCE_GENERATE} == "yes" ]]; then + changed=0 + md5sum ${path} > ${settings[$path]} + fi + done + return ${changed} +} + config_blazar_dashboard config_cloudkitty_dashboard config_designate_dashboard @@ -286,12 +306,7 @@ else rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* fi -# NOTE(jeffrey4l): The local_settings file affect django-compress -# behavior, so re-generate the compressed javascript and css if it -# is changed -MD5SUM_TXT_PATH="/var/lib/kolla/.local_settings.md5sum.txt" -if [[ ! -f ${MD5SUM_TXT_PATH} || $(md5sum -c --status ${MD5SUM_TXT_PATH};echo $?) != 0 || ${FORCE_GENERATE} == "yes" ]]; then - md5sum /etc/openstack-dashboard/local_settings > ${MD5SUM_TXT_PATH} +if settings_changed; then if [[ "${KOLLA_INSTALL_TYPE}" == "binary" ]]; then /usr/bin/manage.py collectstatic --noinput --clear /usr/bin/manage.py compress --force |