From f205e7d2be69a9ed89ccf685d3cf3b4a513e1ef3 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Tue, 21 Sep 2021 12:36:09 -0700
Subject: [PATCH] Remove debian packages file for devstack

This file duplicages devstack's load of bindep for the ironic
repository. As bindep is the authortative file, removing the
legacy way of installing packages from ironic.

Also revises the bindep file to explicitly remove the devstack
group, as it is all devstack.

Change-Id: Ida7ca230069fc0e4f54bde2fc6fffdc9eb0bdcc2
---
 devstack/files/bindep.txt  | 54 ++++++++++++++++++++------------------
 devstack/files/debs/ironic | 41 -----------------------------
 2 files changed, 29 insertions(+), 66 deletions(-)
 delete mode 100644 devstack/files/debs/ironic

diff --git a/devstack/files/bindep.txt b/devstack/files/bindep.txt
index a9abbe3b05..951475d2d0 100644
--- a/devstack/files/bindep.txt
+++ b/devstack/files/bindep.txt
@@ -11,8 +11,8 @@ ipxe [platform:dpkg default]
 ipxe-bootimgs [platform:rpm default]
 socat [default]
 xinetd [default]
-tftpd-hpa [platform:dpkg default]
-tftp-server [platform:rpm default]
+tftpd-hpa [platform:dpkg]
+tftp-server [platform:rpm]
 # Starting with Debian Jessie (and thus in Ubuntu Xenial too),
 # pxelinux package provides the pxelinux.0 boot loader,
 # but such package is absent from Debian Wheezy / Ubuntu Trusty.
@@ -24,31 +24,30 @@ tftp-server [platform:rpm default]
 # or DevStack stops supporting those.
 # In the mean time, new Debian-based release codenames will have to be added
 # as distros can not be pinned with 'if-later-than' specified.
-pxelinux [platform:ubuntu-xenial platform:debian-jessie default]
-syslinux [platform:rpm platform:ubuntu-trusty platform:debian-wheezy default]
-syslinux-common [platform:ubuntu-xenial platform:debian-jessie default]
+pxelinux [platform:dpkg]
+syslinux [platform:rpm platform:ubuntu-trusty platform:debian-wheezy]
+syslinux-common [platform:dpkg]
 socat [default]
 # Grub2 files for boot loadingusing PXE/GRUB2
-shim-signed [platform:dpkg default]
-grub-efi-amd64-signed [platform:dpkg default]
-
-# these are needed to create and access VMs when testing with virtual hardware
-libvirt-bin [platform:dpkg devstack]
-libvirt [platform:rpm devstack]
-libvirt-dev [platform:dpkg devstack]
-libvirt-devel [platform:rpm devstack]
-qemu [platform:dpkg devstack build-image-dib]
-qemu-kvm [platform:dpkg platform:rpm devstack]
-qemu-utils [platform:dpkg devstack build-image-dib]
-qemu-system-data [platform:dpkg devstack]
-sgabios [platform:rpm devstack]
-ipxe-qemu [platform:dpkg devstack]
-edk2-ovmf [platform:rpm devstack]
-ovmf [platform:dpkg devstack]
-ipxe-roms-qemu [platform:rpm devstack]
-openvswitch [platform:rpm devstack]
-iptables [devstack]
-net-tools [platform:rpm devstack]
+shim-signed [platform:dpkg]
+grub-efi-amd64-signed [platform:dpkg]
+libvirt-daemon [platform:dpkg]
+libvirt-clients [platform:dpkg]
+libvirt [platform:rpm]
+libvirt-dev [platform:dpkg]
+libvirt-devel [platform:rpm]
+qemu [platform:dpkg]
+qemu-kvm [platform:dpkg platform:rpm]
+qemu-utils [platform:dpkg]
+qemu-system-data [platform:dpkg]
+sgabios [platform:rpm]
+ipxe-qemu [platform:dpkg]
+edk2-ovmf [platform:rpm]
+ovmf [platform:dpkg]
+ipxe-roms-qemu [platform:rpm]
+openvswitch [platform:rpm]
+iptables [default]
+net-tools [platform:rpm]
 
 # these are needed to compile Python dependencies from sources
 python-dev [platform:dpkg test]
@@ -79,6 +78,11 @@ graphviz [!platform:gentoo test doc]
 # libsrvg2 is needed for sphinxcontrib-svg2pdfconverter in docs builds.
 librsvg2-tools [doc platform:rpm]
 librsvg2-bin [doc platform:dpkg]
+# For parsing of API response json
+jq
+dosfstools [platform:dpkg]
+# Metalsmith jobs
+gdisk [platform:dpkg]
 
 # these are needed to build a deploy ramdisk
 
diff --git a/devstack/files/debs/ironic b/devstack/files/debs/ironic
deleted file mode 100644
index 49b0689d71..0000000000
--- a/devstack/files/debs/ironic
+++ /dev/null
@@ -1,41 +0,0 @@
-# apparmor is an undeclared dependency for docker on ubuntu: https://github.com/docker/docker/issues/9745
-# Starting with Debian Jessie (and thus in Ubuntu Xenial too),
-# pxelinux package provides the pxelinux.0 boot loader,
-# but such package is absent from Debian Wheezy / Ubuntu Trusty.
-# Also, in Debian Wheezy / Ubuntu Trusty 'syslinux' depends on syslinux-common,
-# but only recommends it in Jessie/Xenial.
-# Make sure syslinux-common is installed for those distros as it provides
-# *.c32 modules for syslinux
-# In the mean time, new Debian-based release codenames will have to be added
-# as distros can not be pinned with 'if-later-than' specified.
-apparmor
-docker.io
-gnupg
-ipmitool
-iptables
-ipxe
-ipxe-qemu
-isolinux
-jq
-libguestfs-tools
-libguestfs0
-libvirt-bin # dist:bionic
-libvirt-daemon-system # dist:focal
-libvirt-dev
-open-iscsi
-openssh-client
-ovmf
-pxelinux
-python-libguestfs # dist:bionic
-python3-guestfs # dist:focal
-qemu
-qemu-kvm
-qemu-utils
-qemu-system-data # dist:focal
-sgabios # dist:bionic
-shellinabox
-socat
-squashfs-tools
-syslinux-common
-tftpd-hpa
-xinetd