From f6df20e4e1571d3d0e1ffca2b2ee0dd503beabea Mon Sep 17 00:00:00 2001
From: Adrien Reslinger <adrien@reslinger.net>
Date: Tue, 28 Sep 2021 00:17:18 +0200
Subject: [PATCH] UPdate for RedHat

---
 tasks/main.yml  | 21 +++++++++++++--------
 vars/RedHat.yml | 47 ++++++++++++++++++++++++-----------------------
 2 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 857d69a..5602588 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,11 +2,6 @@
 - name: Include vars for {{ ansible_os_family }}
   include_vars: "{{ ansible_os_family }}.yml"
 
-- name: "Ensure system is x86_64"
-  fail:
-    msg: "qemu-kvm requires a 64bit system architecture for now"
-  when: "ansible_architecture != 'x86_64'"
-
 - name: "Ensure system is hardware virtualization capability"
   fail:
     msg: "qemu-kvm requires hypervisor capability"
@@ -14,6 +9,16 @@
 
 - name: Include tasks for {{ ansible_os_family }}
   include_tasks: "{{ ansible_os_family }}.yml"
+  when:
+    - ansible_distribution == 'CentOS'
+    - ansible_distribution_major_version == '7'
+
+- name: Enable a AppStream RHSM repository
+  community.general.rhsm_repository:
+    name: "rhel-8-for-{{ ansible_architecture }}-appstream-rpms"
+  when:
+    - ansible_distribution == "RedHat"
+    - ansible_distribution_major_version == '8'
 
 - name: install packages
   package:
@@ -30,7 +35,7 @@
     group: root
     mode: 0644
 
-- name: Install Openvswitch
+- name: Install OpenVSwitch
   include_role:
     name: openvswitch
 #  vars:
@@ -44,7 +49,7 @@
     name: "{{ libvirt_service }}"
     state: restarted
 
-#- name: Add Openvswitch bridge
+#- name: Add OpenVSwitch bridge
 #  openvswitch_bridge:
 #    bridge: '{{ qemu_default_network_interface }}'
 #    parent: '{{ openvswitch_interface }}'
@@ -81,7 +86,7 @@
     - default
     - private
 
-- name: Add OpenVswitch networks
+- name: Add OpenVSwitch networks
   virt_net:
     command: define
     name: '{{ item.name }}'
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 0f42f02..ce9b1f9 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -1,33 +1,34 @@
 ---
 libvirt_kvm_packages:
-  - edk2-ovmf
-  - qemu-kvm
-  - libvirt-bash-completion
-  - libvirt-daemon-config-network
-  - libvirt-daemon-config-nwfilter
-  - libvirt-daemon-driver-interface
-  - libvirt-daemon-driver-network
-  - libvirt-daemon-driver-nodedev
-  - libvirt-daemon-driver-nwfilter
-  - libvirt-daemon-driver-qemu
-  - libvirt-daemon-driver-secret
-  - libvirt-daemon-driver-storage
-  - libvirt-daemon-driver-storage-core
-  - libvirt-daemon-driver-storage-disk
-  - libvirt-daemon-driver-storage-gluster
-  - libvirt-daemon-driver-storage-iscsi
-  - libvirt-daemon-driver-storage-iscsi-direct
-  - libvirt-daemon-driver-storage-logical
-  - libvirt-daemon-driver-storage-mpath
-  - libvirt-daemon-driver-storage-rbd
-  - libvirt-daemon-driver-storage-scsi
+#  - edk2-ovmf # vient avec libvirt-daemon-kvm
+#  - qemu-kvm # vient avec libvirt-daemon-kvm
+  - libvirt
+#  - libvirt-bash-completion
+#  - libvirt-daemon-config-network
+#  - libvirt-daemon-config-nwfilter
+#  - libvirt-daemon-driver-interface
+#  - libvirt-daemon-driver-network
+#  - libvirt-daemon-driver-nodedev
+#  - libvirt-daemon-driver-nwfilter
+#  - libvirt-daemon-driver-qemu
+#  - libvirt-daemon-driver-secret
+#  - libvirt-daemon-driver-storage
+#  - libvirt-daemon-driver-storage-core
+#  - libvirt-daemon-driver-storage-disk
+#  - libvirt-daemon-driver-storage-gluster
+#  - libvirt-daemon-driver-storage-iscsi
+#  - libvirt-daemon-driver-storage-iscsi-direct
+#  - libvirt-daemon-driver-storage-logical
+#  - libvirt-daemon-driver-storage-mpath
+#  - libvirt-daemon-driver-storage-rbd
+#  - libvirt-daemon-driver-storage-scsi
   - libvirt-daemon-kvm
   - libvirt-lock-sanlock
   - python3-libvirt
-  - python-lxml
+  - python3-lxml
   - swtpm
   - swtpm-tools
-  - virt-backup
+#  - virt-backup
 #  - virt-install
 libvirt_service: libvirtd