diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-24 12:06:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-24 12:06:00 +0000 |
| commit | b370ccf034b02156b9682cdaee2f17b9efc98e4f (patch) | |
| tree | ee921439bc99fa01f36af8475b75e235b5b8e301 | |
| parent | 193d50d9ce08a774af6a4e06310ec1966795b644 (diff) | |
| parent | aa412be7a867f491912b81e81d4f19f391bdc83c (diff) | |
| download | kolla-b370ccf034b02156b9682cdaee2f17b9efc98e4f.tar.gz kolla-b370ccf034b02156b9682cdaee2f17b9efc98e4f.zip | |
Merge "Tweaks to allow Horizon dev mode"
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 26 |
2 files changed, 18 insertions, 9 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index ded033143..e14137df9 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -132,7 +132,6 @@ ADD plugins-archive / RUN ln -s horizon-source/* horizon \ && {{ macros.install_pip(horizon_pip_packages | customizable("pip_packages")) }} \ && mkdir -p /etc/openstack-dashboard \ - && ln -s /etc/openstack-dashboard/local_settings /var/lib/kolla/venv/lib/python2.7/site-packages/openstack_dashboard/local/local_settings.py \ && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \ && cp /horizon/openstack_dashboard/local/local_settings.py.example /etc/openstack-dashboard/local_settings \ && cp /horizon/manage.py /var/lib/kolla/venv/bin/manage.py \ diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index c61147ae2..8459eb409 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -2,6 +2,19 @@ set -o errexit +FORCE_GENERATE="${FORCE_GENERATE}" + +if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then + SITE_PACKAGES="/usr/lib/python2.7/site-packages" +elif [[ ${KOLLA_INSTALL_TYPE} == "source" ]]; then + SITE_PACKAGES="/var/lib/kolla/venv/lib/python2.7/site-packages" +fi + +if [[ ! -f ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py ]]; then + ln -s /etc/openstack-dashboard/local_settings \ + ${SITE_PACKAGES}/openstack_dashboard/local/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 @@ -13,14 +26,6 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then exit 0 fi -FORCE_GENERATE="no" - -if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then - SITE_PACKAGES="/usr/lib/python2.7/site-packages" -elif [[ ${KOLLA_INSTALL_TYPE} == "source" ]]; then - SITE_PACKAGES="/var/lib/kolla/venv/lib/python2.7/site-packages" -fi - function config_dashboard { ENABLE=$1 SRC=$2 @@ -256,6 +261,11 @@ fi if [[ ! -d "/var/log/kolla/horizon" ]]; then mkdir -p /var/log/kolla/horizon fi + if [[ $(stat -c %a /var/log/kolla/horizon) != "755" ]]; then chmod 755 /var/log/kolla/horizon fi + +if [[ $(stat -c %U ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store) != "horizon" ]]; then + chown horizon ${SITE_PACKAGES}/openstack_dashboard/local/.secret_key_store +fi |