diff options
| author | Zuul <zuul@review.opendev.org> | 2020-06-25 16:48:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-06-25 16:48:22 +0000 |
| commit | 9b85ac9ca30e1fdcdade11209eadb7ba9e779118 (patch) | |
| tree | 27d641b658466b35dcc760ac87601df0d1d2a075 | |
| parent | 96b9390befb89e9971d84ba2692a4d9f9b583eb1 (diff) | |
| parent | dcde7ffdd02f62cbb2a8a52aa93de029ccc2a43d (diff) | |
| download | kolla-9b85ac9ca30e1fdcdade11209eadb7ba9e779118.tar.gz kolla-9b85ac9ca30e1fdcdade11209eadb7ba9e779118.zip | |
Merge "Fix loading of Storm on Centos8 / Python 3"
| -rw-r--r-- | docker/storm/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | releasenotes/notes/fix-loading-of-storm-in-centos8-containers-86b38c9166ceb0dd.yaml | 5 |
2 files changed, 12 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 diff --git a/releasenotes/notes/fix-loading-of-storm-in-centos8-containers-86b38c9166ceb0dd.yaml b/releasenotes/notes/fix-loading-of-storm-in-centos8-containers-86b38c9166ceb0dd.yaml new file mode 100644 index 000000000..1fab18266 --- /dev/null +++ b/releasenotes/notes/fix-loading-of-storm-in-centos8-containers-86b38c9166ceb0dd.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes an issue with loading Storm and Monasca Thresh when using + Centos8 containers. |