From 381a9c03f3a733f2d19b5ec6846d445eddd86d41 Mon Sep 17 00:00:00 2001
From: Erik Berg <openstack@slipsprogrammor.no>
Date: Wed, 12 Jul 2023 10:01:10 +0200
Subject: [PATCH] Consolidate ubuntu/debian required_defaults

sgabios is a virtual package provided by qemu-system-data. Replacing
it with qemu-system-data makes this file identical with ubuntu.

Change-Id: I0f016da347dccda5df9a9c318bf0280cb2097f68
---
 .../defaults/required_defaults_Debian.yml       |  2 +-
 .../defaults/required_defaults_Ubuntu_20.04.yml | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Ubuntu_20.04.yml

diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml
index 792703707..e0ac86e7c 100644
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml
+++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Debian.yml
@@ -9,7 +9,7 @@ required_packages:
  - qemu-utils
  - qemu-kvm
  - qemu-system-x86
- - sgabios
+ - qemu-system-data
  - pkg-config
  - libvirt-dev
  - ovmf
diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Ubuntu_20.04.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Ubuntu_20.04.yml
deleted file mode 100644
index e0ac86e7c..000000000
--- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Ubuntu_20.04.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-sgabios_dir: /usr/share/qemu/
-libvirt_service_name: libvirtd
-required_packages:
- - g++
- - libvirt-daemon-system
- - libxslt1-dev
- - libxml2-dev
- - qemu-utils
- - qemu-kvm
- - qemu-system-x86
- - qemu-system-data
- - pkg-config
- - libvirt-dev
- - ovmf
- - ebtables
- - dnsmasq