From 73d71b21febf8365624dc4a81bc83fc0eb0c1cd4 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 5 Aug 2020 17:47:41 +0200 Subject: [PATCH] Clean up bindep.txt Since we have other means of installing packages, bindep should only be used for the packages required to bootstrap bifrost, i.e. python and development files. Things like MariaDB should wait. ebtables and dnsmasq is needed for libvirt on debian systems, so install it there (and in suse since it's broken now and I cannot test). Change-Id: I955f559e247ff49f5b84453a8c48462c63413acd --- bindep.txt | 13 ++----------- .../defaults/required_defaults_Debian.yml | 2 ++ .../defaults/required_defaults_Suse.yml | 2 ++ .../defaults/required_defaults_Ubuntu_20.04.yml | 2 ++ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/bindep.txt b/bindep.txt index 7b2862cea..05852050c 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,9 +1,7 @@ -dnsmasq epel-release [platform:centos platform:rhel] gcc git -libffi-devel [platform:redhat platform:suse !platform:opensuseproject-42] -libffi-devel-gcc5 [platform:opensuseproject-42] +libffi-devel [platform:redhat platform:suse] libffi-dev [platform:dpkg] libopenssl-devel [platform:suse] openssl-devel [platform:redhat] @@ -11,18 +9,11 @@ libssl-dev [platform:dpkg] lsb-release [platform:suse platform:dpkg] redhat-lsb [platform:redhat] make -mariadb [platform:suse] -mariadb-server [platform:redhat platform:dpkg] -net-tools python3 [platform:rpm] python3-apt [platform:dpkg] python3-minimal [platform:dpkg] python3-devel [platform:rpm] python3-dev [platform:dpkg] python3-dnf [platform:fedora] -python3-venv [platform:dpkg] -python3-xml [platform:suse] -redhat-rpm-config [platform:fedora] -wget +python3-wheel [platform:dpkg] sudo -ebtables 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 61a3085ef..4802191d8 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 @@ -12,3 +12,5 @@ required_packages: - sgabios - pkg-config - libvirt-dev + - ebtables + - dnsmasq diff --git a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Suse.yml b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Suse.yml index f38c10ccb..6b7410dbb 100644 --- a/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Suse.yml +++ b/playbooks/roles/bifrost-create-vm-nodes/defaults/required_defaults_Suse.yml @@ -14,3 +14,5 @@ required_packages: - libxml2-devel - pkg-config - libvirt-devel + - ebtables + - dnsmasq 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 index 4dd2f8fe6..86a85e1b3 100644 --- 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 @@ -12,3 +12,5 @@ required_packages: - qemu-system-data - pkg-config - libvirt-dev + - ebtables + - dnsmasq