guestfs: bringup: fix debian networking issue

When doing make bringup, virt-builder boots an image with network to be
able to install packages for image baseline creation. In order to have
network in the booted image, virt-builder assumes isc-dhcp-client is the
default Debian package for this task. However, this is not the case as
Debian trixie has replaced the default dhcp client isc-dhcp-client with
dhcpcd.

The proper way to fix this is to address the problem at libguestfs
and ensure both packages can be used. This was supported already in
libguestfs for Fedora/Red Hat but not for Debian. So, package support
has been added to libguestfs for Debian hosts [1][2][3]. The fix is now
merged in libguestfs v1.54.1.

[1]
https://lists.libguestfs.org/archives/list/[email protected]/
thread/ANINW4N4D2VYRD5GTAUQWDZDECAN6XFM/#ANINW4N4D2VYRD5GTAUQWDZDECAN6XF
M

[2] 91fab3f498b6847454656acd2f3d5788c533033b ("appliance: add dhcpcd
support on Debian")

[3]
libguestfs/libguestfs@91fab3f498b6847454656acd
2f3d5788c533033b

While we wait Debian to upgrade the package to a newer libguestfs
release that includes the fix, we need to ensure isc-dhcp-client is part
of the host tools. Note that we need to be explicit as isc-dhcp-client
is listed as optional runtime dependency for libguestfs [4].

[4] https://packages.debian.org/trixie/libguestfs0t64

This was reported already in a previous Debian release:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775514

In order to fix this, introduce a new target under the bringup_guestfs
playbook to install libguestfs and it's dependencies. Add this for
Debian, Suse and Fedora/RedHat.

This new target also allows to remove the dependency check at
min_deps introduced by commit 0111187
("Makefile.min_deps: ensure you have virt-builder when using
guestfs"). Min deps is intended for minimal kdevops dependencies to
run kdevops. And it's kdevops job with Ansible/Makefile dedicated
playbooks-roles/targets to ensure libguestfs (including virt-builder) is
installed in the host.

To replicate the issue in Debian testing (without isc-dhcp-client
installed and a libguestfs version < 1.54.1 ), run any of the following
virt-builder commands:

virt-builder fedora-27 --install qemu-guest-agent
[   3.2] Downloading: http://archive.libguestfs.org/builder/fedora-27.xz
[   3.7] Planning how to build this image
[   3.7] Uncompressing
[   5.3] Opening the new disk
libguestfs: warning: current user is not a member of the KVM group
(group ID 994). This user cannot access /dev/kvm, so libguestfs may run
very slowly. It is recommended that you 'chmod 0666 /dev/kvm' or add
the current user to the KVM group (you might need to log out and log
in again).
[  27.3] Setting a random seed
[  27.4] Installing packages: qemu-guest-agent
Error: Failed to synchronize cache for repo 'updates'
virt-builder: error: dnf -y install 'qemu-guest-agent': command exited
with an error

If reporting bugs, run virt-builder with debugging enabled and include the
complete output:

  virt-builder -v -x [...]

sudo virt-builder debian-12 --install sudo
[   0.7] Downloading: http://builder.libguestfs.org/debian-12.xz
[   1.0] Planning how to build this image
[   1.0] Uncompressing
[   2.9] Opening the new disk
[   6.3] Setting a random seed
virt-builder: warning: random seed could not be set for this type of guest
[   6.4] Installing packages: sudo
Ign:1 http://security.debian.org/debian-security bookworm-security
InRelease
Ign:2 http://deb.debian.org/debian bookworm InRelease
Ign:3 http://deb.debian.org/debian bookworm-updates InRelease
Ign:1 http://security.debian.org/debian-security bookworm-security
InRelease
Ign:2 http://deb.debian.org/debian bookworm InRelease
Ign:3 http://deb.debian.org/debian bookworm-updates InRelease
Ign:2 http://deb.debian.org/debian bookworm InRelease
Ign:1 http://security.debian.org/debian-security bookworm-security
InRelease
Ign:3 http://deb.debian.org/debian bookworm-updates InRelease
Err:2 http://deb.debian.org/debian bookworm InRelease
  Temporary failure resolving 'deb.debian.org'
Err:1 http://security.debian.org/debian-security bookworm-security
InRelease
  Temporary failure resolving 'security.debian.org'
Err:3 http://deb.debian.org/debian bookworm-updates InRelease
  Temporary failure resolving 'deb.debian.org'
Reading package lists...
W: Failed to fetch http://deb.debian.org/debian/dists/bookworm/InRelease
Temporary failure resolving 'deb.debian.org'
W: Failed to fetch
http://security.debian.org/debian-security/dists/bookworm-security/InRel
ease
Temporary failure resolving 'security.debian.org'
W: Failed to fetch
http://deb.debian.org/debian/dists/bookworm-updates/InRelease  Temporary
failure resolving 'deb.debian.org'
W: Some index files failed to download. They have been ignored, or old
ones used instead.
Reading package lists...
Building dependency tree...
Reading state information...
The following NEW packages will be installed:
  sudo
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Need to get 1889 kB of archives.
After this operation, 6199 kB of additional disk space will be used.
Ign:1 http://deb.debian.org/debian bookworm/main amd64 sudo amd64 1.9.13p3-1
Ign:1 http://deb.debian.org/debian bookworm/main amd64 sudo amd64 1.9.13p3-1
Ign:1 http://deb.debian.org/debian bookworm/main amd64 sudo amd64 1.9.13p3-1
Err:1 http://deb.debian.org/debian bookworm/main amd64 sudo amd64 1.9.13p3-1
  Temporary failure resolving 'deb.debian.org'
E: Failed to fetch
http://deb.debian.org/debian/pool/main/s/sudo/sudo_1.9.13p3-1_amd64.deb
Temporary failure resolving 'deb.debian.org'
E: Unable to fetch some archives, maybe run apt-get update or try with
--fix-missing?
virt-builder: error:
      export DEBIAN_FRONTEND=noninteractive
      apt_opts='-q -y -o Dpkg::Options::=--force-confnew'
      apt-get $apt_opts update
      apt-get $apt_opts install 'sudo'
    : command exited with an error

If reporting bugs, run virt-builder with debugging enabled and include
the complete output:

  virt-builder -v -x [...]

Signed-off-by: Daniel Gomez <[email protected]>

Author: dkruces

Makefile.min_deps

@@ -10,11 +10,6 @@ BINARY_DEPS += sudo
 BINARY_DEPS += make
 BINARY_DEPS += nc
 BINARY_DEPS += ansible-playbook
-ifneq (y,$(CONFIG_KDEVOPS_FIRST_RUN))
-ifeq (y,$(CONFIG_GUESTFS))
-BINARY_DEPS += virt-builder
-endif
-endif
 
 BINARY_DEPS_VCHECKS := $(subst $(TOPDIR)/,,$(wildcard $(TOPDIR)/scripts/version_check/*))
 

playbooks/roles/bringup_guestfs/tasks/install-deps/debian/main.yml

@@ -0,0 +1,11 @@
+---
+- name: Install libguestfs
+  become: true
+  become_method: ansible.builtin.sudo
+  ansible.builtin.apt:
+    update_cache: true
+    name:
+      - libguestfs-tools
+      - isc-dhcp-client
+    state: present
+  tags: ['install-deps']

playbooks/roles/bringup_guestfs/tasks/install-deps/main.yml

@@ -0,0 +1,17 @@
+---
+- name: Debian-specific setup
+  ansible.builtin.include_tasks: debian/main.yml
+  when: ansible_facts['os_family']|lower == 'debian'
+  tags: ['install-deps']
+
+- name: SuSE-specific setup
+  ansible.builtin.include_tasks: suse/main.yml
+  when: ansible_facts['os_family']|lower == 'suse'
+  tags: ['install-deps']
+
+- name: Fedora/Red Hat Enterprise-specific setup
+  ansible.builtin.include_tasks: redhat/main.yml
+  when:
+    - ansible_facts['os_family']|lower == 'redhat'
+    - ansible_facts['distribution']|lower != "fedora"
+  tags: ['install-deps']

playbooks/roles/bringup_guestfs/tasks/install-deps/redhat/main.yml

@@ -0,0 +1,11 @@
+---
+- name: Install libguestfs on Fedora/RedHat
+  become: true
+  become_method: ansible.builtin.sudo
+  ansible.builtin.yum:
+    update_cache: true
+    name:
+      - libguestfs-tools
+      - dhclient
+    state: present
+  tags: ['install-deps']

playbooks/roles/bringup_guestfs/tasks/install-deps/suse/main.yml

@@ -0,0 +1,10 @@
+---
+- name: Install libguestfs on SUSE
+  become: true
+  become_method: ansible.builtin.sudo
+  ansible.builtin.zypper:
+    name:
+      - libguestfs-tools
+      - dhclient
+    state: present
+  tags: ['install-deps']

playbooks/roles/bringup_guestfs/tasks/main.yml

@@ -1,3 +1,7 @@
+- name: Install dependencies
+  ansible.builtin.include_tasks: install-deps/main.yml
+  tags: ['install-deps']
+
 - name: Verify we're configured {{ topdir_path }}/.config directory exists
   stat:
     path: "{{ topdir_path }}/.config"

scripts/guestfs.Makefile

@@ -47,6 +47,7 @@ ANSIBLE_EXTRA_ARGS += $(GUESTFS_ARGS)
 GUESTFS_BRINGUP_DEPS :=
 GUESTFS_BRINGUP_DEPS +=  $(9P_HOST_CLONE)
 GUESTFS_BRINGUP_DEPS +=  $(LIBVIRT_PCIE_PASSTHROUGH)
+GUESTFS_BRINGUP_DEPS +=  install_libguestfs
 
 KDEVOPS_PROVISION_METHOD		:= bringup_guestfs
 KDEVOPS_PROVISION_DESTROY_METHOD	:= destroy_guestfs
@@ -72,6 +73,14 @@ $(KDEVOPS_PROVISIONED_SSH):
 	$(Q)ansible $(ANSIBLE_VERBOSE) -i hosts all -e 'ansible_python_interpreter=/usr/bin/python3' -m wait_for_connection
 	$(Q)touch $(KDEVOPS_PROVISIONED_SSH)
 
+install_libguestfs:
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+		--inventory localhost, \
+		playbooks/bringup_guestfs.yml \
+		-e 'ansible_python_interpreter=/usr/bin/python3' \
+		--extra-vars=@./extra_vars.yaml \
+		--tags install-deps
+
 bringup_guestfs: $(GUESTFS_BRINGUP_DEPS)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
 		--inventory localhost, \