diff options
| author | Jorge Niedbalski <jorge.niedbalski@linaro.org> | 2018-05-24 04:38:11 -0400 |
|---|---|---|
| committer | Jorge Niedbalski <jorge.niedbalski@linaro.org> | 2018-05-24 04:41:30 -0400 |
| commit | 496c4dea28666fd4e31a2a145ff0b999da8d9d68 (patch) | |
| tree | 3e8eabf05fe068727d52ab55f1339debfd88d0f8 /docker | |
| parent | dfe78ffc96930237549fb3a42b88abdde35711b8 (diff) | |
| download | kolla-496c4dea28666fd4e31a2a145ff0b999da8d9d68.tar.gz kolla-496c4dea28666fd4e31a2a145ff0b999da8d9d68.zip | |
[horizon] change settings prefix for ubuntu/binary
Use /usr/share/openstack-dashboard/openstack_dashboard/local/
instead of site-packages/** for ubuntu/binary installs.
Change-Id: I4043d1439012afa0100e94c40d1dec2ef92152d4
Closes-Bug: #1773105
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
Diffstat (limited to 'docker')
| -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 |