Do not use distro_python_version for interpreter
We can just use python3 - not longer need to tell which exactly like it was in py2/py3 times. Change-Id: Ib02f13cd2ad0037228e8975bd3fc37f41f23846f
This commit is contained in:
parent
f98ad9462b
commit
a11815cd96
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
{% macro install_pip(packages, constraints = true) %}
|
{% macro install_pip(packages, constraints = true) %}
|
||||||
{%- if packages is sequence and packages|length > 0 -%}
|
{%- if packages is sequence and packages|length > 0 -%}
|
||||||
python{{ distro_python_version }} -m pip --no-cache-dir install --upgrade{{ ' ' }}
|
python3 -m pip --no-cache-dir install --upgrade{{ ' ' }}
|
||||||
{%- if constraints %}-c /requirements/upper-constraints.txt {% endif -%}
|
{%- if constraints %}-c /requirements/upper-constraints.txt {% endif -%}
|
||||||
{{ packages | join(' ') }}
|
{{ packages | join(' ') }}
|
||||||
{%- else -%}
|
{%- else -%}
|
||||||
|
|
|
@ -44,7 +44,7 @@ RUN curl -o /tmp/storm.tgz ${storm_url} \
|
||||||
|
|
||||||
{% block storm_python_version %}
|
{% block storm_python_version %}
|
||||||
# NOTE(dszumski): Storm needs to be told where the Py3 interpreter lives
|
# NOTE(dszumski): Storm needs to be told where the Py3 interpreter lives
|
||||||
ENV PYTHON={{ '/usr/bin/python' ~ distro_python_version }}
|
ENV PYTHON='/usr/bin/python3'
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
||||||
|
|
Loading…
Reference in New Issue