diff options
| author | Matt Davis <nitzmahone@users.noreply.github.com> | 2021-05-17 07:10:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-17 09:10:03 -0500 |
| commit | 3d6c8ee3e0a674c91756ee8c92901d6e68f03fd0 (patch) | |
| tree | 9d06e42472fc41795bc033dec615f3bdb143462c | |
| parent | 5ee1fe26657a1cd9721d524a0b9b216e6f4c8caa (diff) | |
| download | ansible-3d6c8ee3e0a674c91756ee8c92901d6e68f03fd0.tar.gz | |
Map Debian 8 to Python 2 (#74152) (#74359)
* Map Debian 8 to Python 2
If Python 3 is installed on Debian 8 Ansible cannot run, as the version
is too old (3.4)
* Add integration test for python interpreter discovery on Debian 8
* fix test issue on Debian 9, add changelog
* un"fix" not broken test :D
Co-authored-by: Fabian Klemp <fabian.klemp@elara-gmbh.de>
Co-authored-by: Matt Davis <mrd@redhat.com>
(cherry picked from commit 437a08eb6de7bf87a8c874e756f9b6b523911e68)
Co-authored-by: elara-leitstellentechnik <elara-leitstellentechnik@users.noreply.github.com>
| -rw-r--r-- | changelogs/fragments/debian8_discovery.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/config/base.yml | 1 | ||||
| -rw-r--r-- | test/integration/targets/interpreter_discovery_python/tasks/main.yml | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/changelogs/fragments/debian8_discovery.yml b/changelogs/fragments/debian8_discovery.yml new file mode 100644 index 0000000000..d502b24fe3 --- /dev/null +++ b/changelogs/fragments/debian8_discovery.yml @@ -0,0 +1,2 @@ +bugfixes: +- interpreter discovery - Debian 8 and lower will avoid unsupported Python3 version in interpreter discovery diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index 070587942d..8f72255b0b 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -1497,6 +1497,7 @@ INTERPRETER_PYTHON_DISTRO_MAP: '6': /usr/bin/python '8': /usr/libexec/platform-python debian: + '8': /usr/bin/python '10': /usr/bin/python3 fedora: '23': /usr/bin/python3 diff --git a/test/integration/targets/interpreter_discovery_python/tasks/main.yml b/test/integration/targets/interpreter_discovery_python/tasks/main.yml index be15186fb2..b8bafd1511 100644 --- a/test/integration/targets/interpreter_discovery_python/tasks/main.yml +++ b/test/integration/targets/interpreter_discovery_python/tasks/main.yml @@ -140,8 +140,11 @@ - name: debian assertions assert: that: - - auto_out.ansible_facts.discovered_interpreter_python == '/usr/bin/python3' - when: distro == 'debian' and distro_version is version('10', '>=') + # Debian 8 and older + - auto_out.ansible_facts.discovered_interpreter_python == '/usr/bin/python' and distro_version is version('8', '<=') or distro_version is version('8', '>') + # Debian 10 and newer + - auto_out.ansible_facts.discovered_interpreter_python == '/usr/bin/python3' and distro_version is version('10', '>=') or distro_version is version('10', '<') + when: distro == 'debian' - name: fedora assertions assert: |