Revert "Fixes #49362 module dnf: install python3-dnf preferably over python2-dnf. (#49402)" (#49633)

This reverts commit 3247eec97a.
This commit is contained in:
Jordan Borean 2018-12-07 08:29:12 +10:00 committed by GitHub
parent 9434f8608a
commit 198f1e1bea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 51 deletions

View file

@ -464,10 +464,10 @@ class DnfModule(YumDnf):
def _ensure_dnf(self): def _ensure_dnf(self):
if not HAS_DNF: if not HAS_DNF:
if not PY2: if PY2:
package = 'python3-dnf'
else:
package = 'python2-dnf' package = 'python2-dnf'
else:
package = 'python3-dnf'
if self.module.check_mode: if self.module.check_mode:
self.module.fail_json( self.module.fail_json(

View file

@ -43,7 +43,3 @@
when: when:
- ansible_distribution == 'Fedora' and ansible_distribution_major_version|int >= 29 - ansible_distribution == 'Fedora' and ansible_distribution_major_version|int >= 29
- ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8 - ansible_distribution == 'RedHat' and ansible_distribution_major_version|int >= 8
- include: 'python3and2.yml'
when:
- ansible_pkg_mgr == 'dnf'

View file

@ -1,44 +0,0 @@
# INSTALLPYTHON3AND2
# The module `dnf` installs python3-dnf on python3 systems and python2-dnf
# on python2 systems. Fedora 30 and newer have python3 and limited
# support for python2, for example python2-dnf is missing.
# This test proves that python3 and python2 can be installed and the module
# `dnf` works.
- name: install python2
dnf:
name: python2
state: present
- name: use python2
set_fact:
ansible_python_interpreter: /usr/bin/python
- name: install a sample package
dnf:
name: screen
state: present
- name: clean up sample package
dnf:
name: screen
state: absent
- name: install python3
dnf:
name: python3
state: present
- name: use python3
set_fact:
ansible_python_interpreter: /usr/bin/python3
- name: install a sample package
dnf:
name: screen
state: present
- name: clean up sample package
dnf:
name: screen
state: absent