diff options
Diffstat (limited to 'docker/horizon')
| -rw-r--r-- | docker/horizon/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/horizon/extend_start.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2 index 0fbeb39db..f2f341202 100644 --- a/docker/horizon/Dockerfile.j2 +++ b/docker/horizon/Dockerfile.j2 @@ -74,7 +74,7 @@ RUN echo > /etc/apache2/ports.conf \ && cp /usr/share/openstack-dashboard/openstack_dashboard/conf/*.json /etc/openstack-dashboard \ && cp /usr/share/openstack-dashboard/manage.py /usr/bin/manage.py \ && rm /etc/apache2/conf-enabled/openstack-dashboard.conf \ - && for locale in /usr/lib/python2.7/site-packages/*/locale; do \ + && for locale in /usr/lib/python{{distro_python_version}}/site-packages/*/locale; do \ (cd ${locale%/*} && /usr/bin/python /usr/bin/manage.py compilemessages) \ done {% endblock %} @@ -136,10 +136,10 @@ RUN ln -s horizon-source/* horizon \ && if [ "$(ls /plugins)" ]; then \ {{ macros.install_pip(horizon_plugins_pip_packages) }}; \ fi \ - && for locale in /var/lib/kolla/venv/lib/python2.7/site-packages/*/locale; do \ + && for locale in /var/lib/kolla/venv/lib/python{{distro_python_version}}/site-packages/*/locale; do \ (cd ${locale%/*} && /var/lib/kolla/venv/bin/python /var/lib/kolla/venv/bin/manage.py compilemessages) \ done \ - && chown -R horizon: /etc/openstack-dashboard /var/lib/kolla/venv/lib/python2.7/site-packages/static + && chown -R horizon: /etc/openstack-dashboard /var/lib/kolla/venv/lib/python{{distro_python_version}}/site-packages/static {% endif %} diff --git a/docker/horizon/extend_start.sh b/docker/horizon/extend_start.sh index 8a3227166..1dc6aeb60 100644 --- a/docker/horizon/extend_start.sh +++ b/docker/horizon/extend_start.sh @@ -5,9 +5,9 @@ set -o errexit FORCE_GENERATE="${FORCE_GENERATE}" if [[ ${KOLLA_INSTALL_TYPE} == "binary" ]]; then - SITE_PACKAGES="/usr/lib/python2.7/site-packages" + SITE_PACKAGES="/usr/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages" elif [[ ${KOLLA_INSTALL_TYPE} == "source" ]]; then - SITE_PACKAGES="/var/lib/kolla/venv/lib/python2.7/site-packages" + SITE_PACKAGES="/var/lib/kolla/venv/lib/python${KOLLA_DISTRO_PYTHON_VERSION}/site-packages" fi if [[ ${KOLLA_INSTALL_TYPE} == "source" ]] && [[ ! -f ${SITE_PACKAGES}/openstack_dashboard/local/local_settings.py ]]; then |