aboutsummaryrefslogtreecommitdiff
path: root/docker/horizon
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-04-12 08:09:11 +0000
committerGerrit Code Review <review@openstack.org>2019-04-12 08:09:11 +0000
commit68b17a2bed7bf47a0fdc63c9e47354cc6c0300fa (patch)
tree1645c61fecf865bf1c92bdf8d73c8e03793def34 /docker/horizon
parentb7290b1f95647e410e6996d66333a7f0b6d467af (diff)
parent6c0065185943355851308ae4df23b73918fab7be (diff)
downloadkolla-68b17a2bed7bf47a0fdc63c9e47354cc6c0300fa.tar.gz
kolla-68b17a2bed7bf47a0fdc63c9e47354cc6c0300fa.zip
Merge "Fix ubuntu binary deploys"
Diffstat (limited to 'docker/horizon')
-rw-r--r--docker/horizon/extend_start.sh24
1 files changed, 13 insertions, 11 deletions
diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh
index 1dc6aeb60..243841b53 100644
--- a/docker/horizon/extend_start.sh
+++ b/docker/horizon/extend_start.sh
@@ -4,12 +4,23 @@ set -o errexit
FORCE_GENERATE="${FORCE_GENERATE}"
+# TODO(mgoddard): Remove this elif when Ubuntu has distro_python_version == 3.
+if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]] && [[ "${KOLLA_BASE_DISTRO}" =~ ubuntu ]]; then
+ KOLLA_DISTRO_PYTHON_VERSION=3
+fi
+
if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then
SITE_PACKAGES="/usr/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages"
elif [[ ${KOLLA_INSTALL_TYPE} == "source" ]]; then
SITE_PACKAGES="/var/lib/kolla/venv/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages"
fi
+if [[ -f "/var/lib/kolla/venv/bin/python" ]]; then
+ MANAGE_PY="/var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py"
+else
+ MANAGE_PY="/usr/bin/python${KOLLA_DISTRO_PYTHON_VERSION} /usr/bin/manage.py"
+fi
+
if [[ ${KOLLA_INSTALL_TYPE} == "source" ]] && [[ ! -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
@@ -29,10 +40,6 @@ 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
- MANAGE_PY="/usr/bin/python /usr/bin/manage.py"
- if [[ -f "/var/lib/kolla/venv/bin/python" ]]; then
- MANAGE_PY="/var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py"
- fi
$MANAGE_PY migrate --noinput
exit 0
fi
@@ -340,13 +347,8 @@ else
fi
if settings_changed; then
- if [[ "${KOLLA_INSTALL_TYPE}" == "binary" ]]; then
- /usr/bin/manage.py collectstatic --noinput --clear
- /usr/bin/manage.py compress --force
- elif [[ "${KOLLA_INSTALL_TYPE}" == "source" ]]; then
- /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py collectstatic --noinput --clear
- /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compress --force
- fi
+ ${MANAGE_PY} collectstatic --noinput --clear
+ ${MANAGE_PY} compress --force
fi
# NOTE(sbezverk) since Horizon is now storing logs in its own location, /var/log/horizon