From 4502eaf83e21903b3093df697402dca17cdb7963 Mon Sep 17 00:00:00 2001
From: Erik Berg <openstack@slipsprogrammor.no>
Date: Thu, 13 Jul 2023 01:22:21 +0200
Subject: [PATCH] Reduce the libvirt/qemu packages list

- remove qemu-kvm-common from deps

    If it's not needed for CentOS, it's probably not needed for any
    in the redhat family.

- remove qemu-system-<arch>

    qemu-kvm is a meta-package that provides qemu-system-<arch>
    package for native architectures where kvm can be enabled. For
    example, in an x86 system, this will install qemu-system-x86

+ libvirt-daemon-kvm will install

    libvirt-daemon-driver-network
    libvirt-daemon-driver-nodedev
    libvirt-daemon-driver-nwfilter
    libvirt-daemon-driver-qemu
    libvirt-daemon-driver-secret
    libvirt-daemon-driver-storage

    (It requires and will also install the qemu-kvm meta-package,
    so this could be omitted aswell.)

+ libvirt requires/installs these packages

    libvirt-daemon-config-network
    libvirt-daemon-config-nwfilter

    So we can trim these out. (It also requires and will install
    libvirt-client, libvirt-daemon, which could be omitted aswell)

Change-Id: I02ef5fdbdb8c04314556b8e56d57582226a05b08
---
 .../defaults/required_defaults_CentOS.yml                 | 8 --------
 .../defaults/required_defaults_Fedora.yml                 | 2 +-
 .../defaults/required_defaults_RedHat.yml                 | 3 +--
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml
index e63a3d332..540d1caa6 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_CentOS.yml
@@ -9,14 +9,6 @@ required_packages:
  - libvirt
  - libvirt-client
  - libvirt-daemon
- - libvirt-daemon-config-network
- - libvirt-daemon-config-nwfilter
- - 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-kvm
  - python3-libvirt
  - edk2-ovmf
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Fedora.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Fedora.yml
index 992f814e7..c2f3030a1 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Fedora.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Fedora.yml
@@ -4,11 +4,11 @@ libvirt_service_name: libvirtd
 required_packages:
  - qemu-img
  - qemu-kvm
- - qemu-system-x86
  - sgabios-bin
  - libvirt
  - libvirt-client
  - libvirt-daemon
+ - libvirt-daemon-kvm
  - python3-libvirt
  - python3-libselinux
  - edk2-ovmf
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml
index 605745b83..5830f684f 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_RedHat.yml
@@ -6,12 +6,11 @@ required_packages:
  - qemu-img
  - kernel-tools
  - qemu-kvm
- - qemu-kvm-common
- - qemu-system-x86
  - sgabios-bin
  - libvirt
  - libvirt-client
  - libvirt-daemon
+ - libvirt-daemon-kvm
  - python3-libvirt
  - libxslt-devel
  - libxml2-devel