From d81085b12d500afb9f0d233c0d2fa42a83e92eed Mon Sep 17 00:00:00 2001 From: Luke Short Date: Tue, 15 Dec 2020 11:30:21 -0700 Subject: [PATCH] Detect EL8 platform-python Otherwise, this script fails to run on Enterprise Linux 8 distros. Change-Id: I0168b380d0e201d9c8f8121b384d25a2412c2129 Signed-off-by: Luke Short (cherry picked from commit 2d692e22f42bc64476ab01ff7e8c4d4717ef3786) --- heat/cloudinit/loguserdata.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/heat/cloudinit/loguserdata.py b/heat/cloudinit/loguserdata.py index e02a59baeb..413f3a7582 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