diff options
| author | Doug Szumski <doug@stackhpc.com> | 2020-05-23 16:23:09 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2020-06-18 22:12:43 +0000 |
| commit | dcde7ffdd02f62cbb2a8a52aa93de029ccc2a43d (patch) | |
| tree | 7695ef53dc4f86d6237ff90678de4f349e364bc3 /docker | |
| parent | 039a6d431ae1b2ddfb7b593c1c2d10bb58556b9e (diff) | |
| download | kolla-dcde7ffdd02f62cbb2a8a52aa93de029ccc2a43d.tar.gz kolla-dcde7ffdd02f62cbb2a8a52aa93de029ccc2a43d.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 42f03897f..2f04cf306 100644 --- a/docker/storm/Dockerfile.j2 +++ b/docker/storm/Dockerfile.j2 @@ -42,6 +42,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 |