diff options
| author | Zuul <zuul@review.openstack.org> | 2018-05-27 02:33:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-05-27 02:33:00 +0000 |
| commit | 838f451f88a9331d4ae93309b4d6127b96c19640 (patch) | |
| tree | 47c9fb5c210715521424406d548c52c5452f49b1 | |
| parent | cc67155fa4783c39b35d33e0e3db6267b09d3977 (diff) | |
| parent | 496c4dea28666fd4e31a2a145ff0b999da8d9d68 (diff) | |
| download | kolla-838f451f88a9331d4ae93309b4d6127b96c19640.tar.gz kolla-838f451f88a9331d4ae93309b4d6127b96c19640.zip | |
Merge "[horizon] change settings prefix for ubuntu/binary"
| -rw-r--r-- | docker/horizon/extend_start.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 4925b48ab..20e82c12b 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -15,9 +15,15 @@ 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 +if [[ -f /etc/openstack-dashboard/custom_local_settings ]]; then + CUSTOM_SETTINGS_FILE="${SITE_PACKAGES}/openstack_dashboard/local/custom_local_settings.py" + if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]] && [[ "${KOLLA_BASE_DISTRO}" =~ ubuntu ]]; then + CUSTOM_SETTINGS_FILE="/usr/share/openstack-dashboard/openstack_dashboard/local/custom_local_settings.py" + fi + + if [[ ! -L ${CUSTOM_SETTINGS_FILE} ]]; then + ln -s /etc/openstack-dashboard/custom_local_settings ${CUSTOM_SETTINGS_FILE} + fi fi # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases |