diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-01 11:06:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-01 11:06:53 +0000 |
| commit | d5d8f74e6d9642c1df6a48dadb6ab828cf2ffe05 (patch) | |
| tree | 9b53220867109f4f58203c79eeef5ccf0cdd6186 | |
| parent | c881da8b87a04bbd61eabaf68e6c0fc167e898fa (diff) | |
| parent | 98fade887a8d691080b607c4e43be30e6bd3311a (diff) | |
| download | heat-d5d8f74e6d9642c1df6a48dadb6ab828cf2ffe05.tar.gz | |
Merge "Detect EL8 platform-python" into stable/victoria
| -rwxr-xr-x | heat/cloudinit/loguserdata.py | 9 |
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 |