aboutsummaryrefslogtreecommitdiff
path: root/docker/horizon/Dockerfile.j2
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-03-08 13:19:03 +0100
committerMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2019-03-12 17:13:46 +0000
commit8df6eb01184672ffdc752437ea4d98d13f16026e (patch)
treee4121f587d342afa739a6ffde89074d978eea648 /docker/horizon/Dockerfile.j2
parent8ae32bb17258a2211e03592bfaae6c648cda6089 (diff)
downloadkolla-8df6eb01184672ffdc752437ea4d98d13f16026e.tar.gz
kolla-8df6eb01184672ffdc752437ea4d98d13f16026e.zip
replace 'distro_python3' variable with 'distro_python_version'
RHEL7 derived distros use Python 2.7 RHEL8 uses Python 3.6 Ubuntu 18.04 uses Python 3.6, but we haven't enabled it yet. Debian:buster uses Python 3.7, but we haven't enabled it yet. We have several places in code where "/lib/pythonX.Y/site-packages" is used so we need to know value of X.Y rather than py2/py3 switch. How to check for Python 2: {% if distro_python_version == '2.7' %} Breaks: Iad6b70b433a0dd1b0f8ae6790fd280594517661a Change-Id: Ie24f109af19ae0438c21e0d43cb3cc947812b4ce
Diffstat (limited to 'docker/horizon/Dockerfile.j2')
-rw-r--r--docker/horizon/Dockerfile.j26
1 files changed, 3 insertions, 3 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 %}