CentOS7 now has support for python 3 out of the box
Signed-off-by: Daniel P. Berrangé <berrange@xxxxxxxxxx>
---
guests/host_vars/libvirt-centos-7/main.yml | 2 --
guests/playbooks/update/tasks/bootstrap.yml | 6 ------
guests/vars/mappings.yml | 24 ---------------------
guests/vars/projects/base.yml | 1 -
guests/vars/projects/libvirt-python.yml | 4 ----
5 files changed, 37 deletions(-)
diff --git a/guests/host_vars/libvirt-centos-7/main.yml b/guests/host_vars/libvirt-centos-7/main.yml
index 94e29af..d730aa2 100644
--- a/guests/host_vars/libvirt-centos-7/main.yml
+++ b/guests/host_vars/libvirt-centos-7/main.yml
@@ -16,5 +16,3 @@ package_format: 'rpm'
package_manager: 'yum'
os_name: 'CentOS'
os_version: '7'
-
-ansible_python_interpreter: /usr/bin/python2
diff --git a/guests/playbooks/update/tasks/bootstrap.yml b/guests/playbooks/update/tasks/bootstrap.yml
index 2e1dc42..c77d3a1 100644
--- a/guests/playbooks/update/tasks/bootstrap.yml
+++ b/guests/playbooks/update/tasks/bootstrap.yml
@@ -7,11 +7,5 @@
- set_fact:
python: python3
-- set_fact:
- python: python2
- when:
- - os_name == 'CentOS'
- - os_version == '7'
-
- name: Bootstrap Ansible
raw: '{{ package_manager }} install -y {{ python }}'
diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index 9c339f2..ce1294c 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -804,30 +804,6 @@ mappings:
CentOS7: python36-docutils
FreeBSD: py36-docutils
- python2:
- default: python
- Fedora: python2
- FreeBSD: python2
-
- python2-devel:
- deb: python-dev
- pkg: python2
- rpm: python2-devel
- cross-policy-deb: foreign
-
- python2-lxml:
- default: python-lxml
- Fedora: python2-lxml
- FreeBSD: py27-lxml
-
- python2-nose:
- default: python-nose
- Fedora: python2-nose
- FreeBSD: py27-nose
-
- python2-setuptools:
- CentOS7: python2-setuptools
-
python3:
default: python3
diff --git a/guests/vars/projects/base.yml b/guests/vars/projects/base.yml
index 275211c..29c10b4 100644
--- a/guests/vars/projects/base.yml
+++ b/guests/vars/projects/base.yml
@@ -25,7 +25,6 @@ packages:
- patch
- perl
- pkg-config
- - python2-setuptools
- python3
- python3-pip
- python3-setuptools
diff --git a/guests/vars/projects/libvirt-python.yml b/guests/vars/projects/libvirt-python.yml
index 86b5aab..71a0717 100644
--- a/guests/vars/projects/libvirt-python.yml
+++ b/guests/vars/projects/libvirt-python.yml
@@ -1,9 +1,5 @@
---
packages:
- - python2
- - python2-devel
- - python2-lxml
- - python2-nose
- python3-devel
- python3-lxml
- python3-nose
--
2.23.0
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list
