summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Short <ekultails@gmail.com>2020-12-15 11:30:21 -0700
committerShnaidman Sagi (Sergey) <sshnaidm@redhat.com>2021-08-18 13:58:49 +0000
commit73150f2207d77f071551c0a41cdeb8e93df699bd (patch)
treed81f12e2459edb30e67d715c365f6bb580d10041
parent8fbd4476c00565c38ff341e639cee5cbdf83f0f9 (diff)
downloadheat-73150f2207d77f071551c0a41cdeb8e93df699bd.tar.gz
Detect EL8 platform-python
Otherwise, this script fails to run on Enterprise Linux 8 distros. Change-Id: I0168b380d0e201d9c8f8121b384d25a2412c2129 Signed-off-by: Luke Short <ekultails@gmail.com> (cherry picked from commit 2d692e22f42bc64476ab01ff7e8c4d4717ef3786)
-rwxr-xr-xheat/cloudinit/loguserdata.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/heat/cloudinit/loguserdata.py b/heat/cloudinit/loguserdata.py
index e02a59bae..413f3a758 100755
--- a/heat/cloudinit/loguserdata.py
+++ b/heat/cloudinit/loguserdata.py
@@ -16,8 +16,17 @@
# but pkg_resources can't be imported.
echo "import pkg_resources" | python3 2>/dev/null
has_py3=$?
+echo "import pkg_resources" | python2 2>/dev/null
+has_py2=$?
+echo "import pkg_resources" | /usr/libexec/platform-python 2>/dev/null
+has_platform-py=$?
+
if [ $has_py3 = 0 ]; then
interpreter="python3"
+elif [ $has_py2 = 0 ]; then
+ interpreter="python"
+elif [ $has_platform-py = 0 ]; then
+ interpreter="/usr/libexec/platform-python"
else
interpreter="python"
fi