diff options
| author | Doug Szumski <doug@stackhpc.com> | 2020-05-23 16:23:09 +0000 |
|---|---|---|
| committer | Doug Szumski <doug@stackhpc.com> | 2020-06-25 16:17:17 +0000 |
| commit | 4ef9c5e679e49eb91a386ffe328383a1f62425bd (patch) | |
| tree | 50f48c4bbac171649b391684c162d70f075ae36f /docker | |
| parent | 0a6cd606c68281b6ef8301ab7a8e954440a6714a (diff) | |
| download | kolla-4ef9c5e679e49eb91a386ffe328383a1f62425bd.tar.gz kolla-4ef9c5e679e49eb91a386ffe328383a1f62425bd.zip | |
Fix loading of Storm on Centos8 / Python 3
In the Centos8 images, Storm fails to start since it cannot find
Python. This patch ensures that it can by setting the PYTHON env
var.
Change-Id: If6663b2f6dfadfd6a6db5e4aaca4eb782b87161f
Closes-Bug: #1876461
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/storm/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/storm/Dockerfile.j2 b/docker/storm/Dockerfile.j2 index d3b3f8acf..51552926c 100644 --- a/docker/storm/Dockerfile.j2 +++ b/docker/storm/Dockerfile.j2 @@ -40,6 +40,13 @@ RUN curl -sSL -o /tmp/storm.tgz ${storm_url} \ {% endblock %} +{% block storm_python_version %} +# NOTE(dszumski): Storm needs to be told where the Py3 interpreter lives +{% if distro_python_version.startswith('3') %} +ENV PYTHON={{ '/usr/bin/python' ~ distro_python_version }} +{% endif %} +{% endblock %} + COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start |