From dcde7ffdd02f62cbb2a8a52aa93de029ccc2a43d Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Sat, 23 May 2020 16:23:09 +0000
Subject: [PATCH] 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
---
 docker/storm/Dockerfile.j2                                 | 7 +++++++
 ...ng-of-storm-in-centos8-containers-86b38c9166ceb0dd.yaml | 5 +++++
 2 files changed, 12 insertions(+)
 create mode 100644 releasenotes/notes/fix-loading-of-storm-in-centos8-containers-86b38c9166ceb0dd.yaml

diff --git a/docker/storm/Dockerfile.j2 b/docker/storm/Dockerfile.j2
index 42f03897fe..2f04cf3069 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 0000000000..1fab182662
--- /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.