* [PATCH kdevops v2 0/4] guestfs: replacement for vagrant in kdevops
@ 2023-12-08 15:01 Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/ Jeff Layton
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: Jeff Layton @ 2023-12-08 15:01 UTC (permalink / raw)
To: Luis Chamberlain; +Cc: kdevops, Jeff Layton
As we discussed recently at LPC, Vagrant is unmaintained and needs
replacement. This patchset implements a new "bringup" method alongside
Vagrant and Terraform, that uses libguestfs tools to create an image and
then has libvirt launch them directly:
https://libguestfs.org/
The first 3 patches are cleanup patches that try to rework various
variable names to not have "VAGRANT" or "vagrant" embedded in them.
The last patch implements the new bringup method.
There may be some (hopefully minor) breakage to existing .config files
due to the first patch. I detailed the reasons why I think it's benign
in the changelog, but there is some risk there.
guestfs is not yet at feature parity yet with Vagrant:
- Fedora works for me, but the Debian image is _very_ minimal and seems
to lack some things that kdevops expects. I haven't tested opensuse
either.
- The XML template needs more work, particularly to handle more complex
setups like PCI passthrough and CXL. Only the basic storage options
currently work. Things like ZNS or large storage options haven't
been implemented yet.
- I didn't try to convert the maze of menus for the distro selection. You
have to set the os-version string for virt-builder in a single option.
I tend to think of this as a feature, but I'm open to other opinions.
- It needs "firstrun" work to help the user ensure that the correct
packages are installed for new bringup method.
Patches from others are welcome for all of the above.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
Changes in v2:
- give guestfs its own makefile instead of piggybacking on vagrant's
- do a more thorough conversion to remove VAGRANT from various variable
names in kconfigs and makefiles
---
Jeff Layton (4):
Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/
nfsd: key off of LIBVIRT instead of VAGRANT for storage config
vagrant: rename the RHEL registration settings
guestfs: add a new local guest management variant
Makefile | 4 +
Makefile.kdevops | 14 +-
defconfigs/cxl-switch | 2 +-
kconfigs/Kconfig.bringup | 6 +
kconfigs/Kconfig.nfsd | 12 +-
kconfigs/workflows/Kconfig.data_partition | 2 +
playbooks/roles/devconfig/defaults/main.yml | 4 +-
.../devconfig/tasks/install-deps/redhat/main.yml | 8 +-
playbooks/roles/gen_nodes/defaults/main.yml | 1 +
playbooks/roles/gen_nodes/tasks/main.yml | 30 +++
.../roles/gen_nodes/templates/guestfs_nodes.j2 | 3 +
.../roles/gen_nodes/templates/guestfs_q35.j2.xml | 228 +++++++++++++++++++++
.../roles/pynfs/tasks/install-deps/redhat/main.yml | 4 +-
scripts/bringup.Makefile | 7 +-
scripts/bringup_guestfs.sh | 92 +++++++++
scripts/bringup_vagrant.sh | 6 +-
scripts/destroy_guestfs.sh | 29 +++
scripts/gen-nodes.Makefile | 2 +-
scripts/guestfs.Makefile | 88 ++++++++
scripts/prune_stale_vagrant.sh | 2 +-
scripts/update_ssh_config_guestfs.py | 94 +++++++++
scripts/vagrant.Makefile | 22 +-
vagrant/Kconfig | 95 +++++----
vagrant/Kconfig.fedora | 10 +-
.../xfs/unassigned/fstests-next-20230515 | 10 +-
.../libvirt-qemu/20231003-huge/kdevops.config | 10 +-
.../kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config | 10 +-
.../tmpfs/libvirt-qemu/20231003/kdevops.config | 10 +-
.../tmpfs/libvirt-qemu/20231004/kdevops.config | 10 +-
.../tmpfs/libvirt-qemu/20231006/kdevops.config | 10 +-
.../tmpfs/libvirt-qemu/20231009/kdevops.config | 10 +-
.../tmpfs/libvirt-qemu/20231011/kdevops.config | 10 +-
.../tmpfs/libvirt-qemu/20231012/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230522/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230725/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230727/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230728/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230731/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230807/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230811/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230817/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230825/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230828/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230829/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230903/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20230909/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231023-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231023/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231024-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231024-0002/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231026-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231026-0002/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231027-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231030-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231030-0002/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231030-0003/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231101-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231101-0002/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231101-0003/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231102-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231102-0002/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231103-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231103-0002/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231104-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231105-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231106-0001/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231106-0002/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231106-0003/kdevops.config | 10 +-
.../xfs/libvirt-qemu/20231108-0001/kdevops.config | 10 +-
.../tmpfs/libvirt-qemu/20231025/kdevops.config | 10 +-
workflows/linux/Kconfig | 2 +-
workflows/linux/Kconfig.kdevops | 2 +-
workflows/linux/Kconfig.linus | 4 +-
workflows/linux/Kconfig.mcgrof | 4 +-
workflows/linux/Kconfig.next | 4 +-
workflows/linux/Kconfig.stable | 4 +-
76 files changed, 921 insertions(+), 324 deletions(-)
---
base-commit: aa502131273a3d5c8f975e4777519edd7ade59de
change-id: 20231206-guestfs-6b1c230f6b6f
Best regards,
--
Jeff Layton <jlayton@kernel.org>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/
2023-12-08 15:01 [PATCH kdevops v2 0/4] guestfs: replacement for vagrant in kdevops Jeff Layton
@ 2023-12-08 15:01 ` Jeff Layton
2023-12-09 2:05 ` Luis Chamberlain
2023-12-08 15:01 ` [PATCH kdevops v2 2/4] nfsd: key off of LIBVIRT instead of VAGRANT for storage config Jeff Layton
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: Jeff Layton @ 2023-12-08 15:01 UTC (permalink / raw)
To: Luis Chamberlain; +Cc: kdevops, Jeff Layton
The the libvirt Kconfig options that have VAGRANT in the name are really
all about libvirt and have little to do with vagrant at all. While we
need to replace vagrant, we want to keep a lot of the existing libvirt
handling code intact. This patch renames all of the options that have
VAGRANT_LIBVIRT into the name to just be LIBVIRT.
There should be no functional changes, but this may cause some options
that were set before to be lost on rename. I think however those losses
should be mostly benign. These two options should just end up defaulting
correctly if they are not set when the config is loaded:
VAGRANT_LIBVIRT => LIBVIRT
USE_VAGRANT_LIBVIRT_MIRROR => USE_LIBVIRT_MIRROR
The last three options are "firstrun" options that are usually not set
when we have an existing .config:
VAGRANT_LIBVIRT_INSTALL => LIBVIRT_INSTALL
VAGRANT_LIBVIRT_CONFIGURE => LIBVIRT_CONFIGURE
VAGRANT_LIBVIRT_VERIFY => LIBVIRT_VERIFY
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
Makefile.kdevops | 14 +++----
defconfigs/cxl-switch | 2 +-
scripts/bringup.Makefile | 6 +--
scripts/bringup_vagrant.sh | 6 +--
scripts/gen-nodes.Makefile | 2 +-
scripts/prune_stale_vagrant.sh | 2 +-
scripts/vagrant.Makefile | 10 ++---
vagrant/Kconfig | 48 +++++++++++-----------
.../xfs/unassigned/fstests-next-20230515 | 10 ++---
.../libvirt-qemu/20231003-huge/kdevops.config | 10 ++---
.../kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config | 10 ++---
.../tmpfs/libvirt-qemu/20231003/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231004/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231006/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231009/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231011/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231012/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230522/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230725/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230727/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230728/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230731/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230807/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230811/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230817/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230825/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230828/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230829/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230903/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20230909/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231023-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231023/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231024-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231024-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231026-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231026-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231027-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231030-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231030-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231030-0003/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231101-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231101-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231101-0003/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231102-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231102-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231103-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231103-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231104-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231105-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231106-0001/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231106-0002/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231106-0003/kdevops.config | 10 ++---
.../xfs/libvirt-qemu/20231108-0001/kdevops.config | 10 ++---
.../tmpfs/libvirt-qemu/20231025/kdevops.config | 10 ++---
workflows/linux/Kconfig | 2 +-
workflows/linux/Kconfig.kdevops | 2 +-
workflows/linux/Kconfig.linus | 4 +-
workflows/linux/Kconfig.mcgrof | 4 +-
workflows/linux/Kconfig.next | 4 +-
workflows/linux/Kconfig.stable | 4 +-
60 files changed, 285 insertions(+), 285 deletions(-)
diff --git a/Makefile.kdevops b/Makefile.kdevops
index d07b69dc73c5..e58fe08a7a0d 100644
--- a/Makefile.kdevops
+++ b/Makefile.kdevops
@@ -21,13 +21,13 @@ kdevops_vagrant_install_vagrant:
$(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant.yml \
-e 'ansible_python_interpreter=/usr/bin/python3'
-kdevops_vagrant_install_libvirt:
+kdevops_install_libvirt:
@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_configuration=True" \
-e 'ansible_python_interpreter=/usr/bin/python3'
-kdevops_vagrant_configure_libvirt:
+kdevops_configure_libvirt:
@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_install=True" \
@@ -36,8 +36,8 @@ kdevops_vagrant_configure_libvirt:
kdevops_vagrant_deps: \
kdevops_vagrant_install_vagrant \
- kdevops_vagrant_install_libvirt \
- kdevops_vagrant_configure_libvirt
+ kdevops_install_libvirt \
+ kdevops_configure_libvirt
PHONY += kdevops_vagrant_deps
KDEVOPS_VAGRANT_WORK := kdevops_vagrant_deps
@@ -50,14 +50,14 @@ kdevops_vagrant_boxes:
PHONY += kdevops_vagrant_boxes
KDEVOPS_VAGRANT_WORK += kdevops_vagrant_boxes
-kdevops_verify_vagrant_user:
+kdevops_verify_libvirt_user:
@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "only_verify_user=True" \
-e 'ansible_python_interpreter=/usr/bin/python3'
-PHONY += kdevops_verify_vagrant_user
-KDEVOPS_VAGRANT_WORK += kdevops_verify_vagrant_user
+PHONY += kdevops_verify_libvirt_user
+KDEVOPS_VAGRANT_WORK += kdevops_verify_libvirt_user
kdevops_libvirt_storage_pool_create:
@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
diff --git a/defconfigs/cxl-switch b/defconfigs/cxl-switch
index c5f8915584f3..6fcd1c5178ed 100644
--- a/defconfigs/cxl-switch
+++ b/defconfigs/cxl-switch
@@ -1,5 +1,5 @@
CONFIG_VAGRANT=y
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
CONFIG_QEMU_BUILD=y
CONFIG_QEMU_BIN_PATH_LIBVIRT="/usr/local/bin/qemu-system-x86_64"
CONFIG_QEMU_BUILD_JIC23=y
diff --git a/scripts/bringup.Makefile b/scripts/bringup.Makefile
index 0051bc3d5e0d..2219cb3f4342 100644
--- a/scripts/bringup.Makefile
+++ b/scripts/bringup.Makefile
@@ -4,11 +4,11 @@ ifeq (,$(wildcard $(CURDIR)/.config))
else
# stage-2-y targets gets called after all local config files have been generated
stage-2-$(CONFIG_TERRAFORM) += kdevops_terraform_deps
-stage-2-$(CONFIG_VAGRANT_LIBVIRT_INSTALL) += kdevops_vagrant_install_libvirt
-stage-2-$(CONFIG_VAGRANT_LIBVIRT_CONFIGURE) += kdevops_vagrant_configure_libvirt
+stage-2-$(CONFIG_LIBVIRT_INSTALL) += kdevops_install_libvirt
+stage-2-$(CONFIG_LIBVIRT_CONFIGURE) += kdevops_configure_libvirt
stage-2-$(CONFIG_VAGRANT) += kdevops_vagrant_install_vagrant
stage-2-$(CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES) += kdevops_vagrant_boxes
-stage-2-$(CONFIG_VAGRANT_LIBVIRT_VERIFY) += kdevops_verify_vagrant_user
+stage-2-$(CONFIG_LIBVIRT_VERIFY) += kdevops_verify_libvirt_user
stage-2-$(CONFIG_LIBVIRT_STORAGE_POOL_CREATE) += kdevops_libvirt_storage_pool_create
DEFAULT_DEPS += kdevops_stage_2
diff --git a/scripts/bringup_vagrant.sh b/scripts/bringup_vagrant.sh
index ad19d2980e4e..0ebcd4b3f4ba 100755
--- a/scripts/bringup_vagrant.sh
+++ b/scripts/bringup_vagrant.sh
@@ -23,10 +23,10 @@ get_canonical_version()
_vagrant_lacks_parallel()
{
PARALLEL_MISSING="0.7.0"
- VAGRANT_LIBVIRT_VERSION="$(vagrant plugin list | sed -e 's|(| |g' | sed -e 's|,| |g' | awk '{print $2}')"
+ LIBVIRT_VERSION="$(vagrant plugin list | sed -e 's|(| |g' | sed -e 's|,| |g' | awk '{print $2}')"
OLD=$(get_canonical_version $PARALLEL_MISSING)
- CURRENT=$(get_canonical_version $VAGRANT_LIBVIRT_VERSION)
+ CURRENT=$(get_canonical_version $LIBVIRT_VERSION)
if [[ "$CURRENT" -le "$OLD" ]]; then
return 1
fi
@@ -57,7 +57,7 @@ vagrant_check_dups()
kdevops_pool_path="$CONFIG_KDEVOPS_STORAGE_POOL_PATH"
# For libvirt we can do one more global sanity check
- if [[ "$CONFIG_VAGRANT_LIBVIRT" == "y" ]]; then
+ if [[ "$CONFIG_LIBVIRT" == "y" ]]; then
possible_image="${kdevops_pool_path}/vagrant_${instance}.img"
if [[ -f $possible_image ]]; then
echo "Image for instance $instance already exists ($possible_image), skippin bringup wipe of spare drives ..."
diff --git a/scripts/gen-nodes.Makefile b/scripts/gen-nodes.Makefile
index a4f42e64dd52..5c3f87ea100b 100644
--- a/scripts/gen-nodes.Makefile
+++ b/scripts/gen-nodes.Makefile
@@ -31,7 +31,7 @@ ifeq (y,$(CONFIG_LIBVIRT_HOST_PASSTHROUGH))
GEN_NODES_EXTRA_ARGS += libvirt_host_passthrough='True'
endif
-ifeq (y,$(CONFIG_VAGRANT_LIBVIRT))
+ifeq (y,$(CONFIG_LIBVIRT))
GEN_NODES_EXTRA_ARGS += libvirt_qemu_group='$(subst ",,$(CONFIG_LIBVIRT_QEMU_GROUP))'
endif
diff --git a/scripts/prune_stale_vagrant.sh b/scripts/prune_stale_vagrant.sh
index 012a0aaf08c3..95b88911c0a6 100755
--- a/scripts/prune_stale_vagrant.sh
+++ b/scripts/prune_stale_vagrant.sh
@@ -31,7 +31,7 @@ if [[ "$CONFIG_LIBVIRT_URI_SESSION" == "y" ]]; then
SUDO_REQ=""
fi
-if [[ "$CONFIG_VAGRANT_LIBVIRT" != "y" ]]; then
+if [[ "$CONFIG_LIBVIRT" != "y" ]]; then
echo "Only libvirt is supported at this time for this prune"
exit 1
fi
diff --git a/scripts/vagrant.Makefile b/scripts/vagrant.Makefile
index df0f68323c58..48d990321190 100644
--- a/scripts/vagrant.Makefile
+++ b/scripts/vagrant.Makefile
@@ -29,7 +29,7 @@ endif
VAGRANT_ARGS += kdevops_storage_pool_user='$(USER)'
-ifeq (y,$(CONFIG_VAGRANT_LIBVIRT))
+ifeq (y,$(CONFIG_LIBVIRT))
VAGRANT_ARGS += libvirt_provider=True
QEMU_GROUP:=$(subst ",,$(CONFIG_LIBVIRT_QEMU_GROUP))
@@ -51,9 +51,9 @@ ifeq (y,$(CONFIG_BOOTLINUX_9P))
VAGRANT_9P_HOST_CLONE := vagrant_9p_linux_clone
endif
-VAGRANT_LIBVIRT_PCIE_PASSTHROUGH :=
+LIBVIRT_PCIE_PASSTHROUGH :=
ifeq (y,$(CONFIG_KDEVOPS_LIBVIRT_PCIE_PASSTHROUGH))
-VAGRANT_LIBVIRT_PCIE_PASSTHROUGH := vagrant_libvirt_pcie_passthrough_permissions
+LIBVIRT_PCIE_PASSTHROUGH := libvirt_pcie_passthrough_permissions
endif
ifneq ($(strip $(CONFIG_VAGRANT_RHEL_ORG_ID)),)
@@ -71,7 +71,7 @@ ANSIBLE_EXTRA_ARGS += $(VAGRANT_ARGS)
VAGRANT_BRINGUP_DEPS :=
VAGRANT_BRINGUP_DEPS += $(VAGRANT_PRIVATE_BOX_DEPS)
VAGRANT_BRINGUP_DEPS += $(VAGRANT_9P_HOST_CLONE)
-VAGRANT_BRINGUP_DEPS += $(VAGRANT_LIBVIRT_PCIE_PASSTHROUGH)
+VAGRANT_BRINGUP_DEPS += $(LIBVIRT_PCIE_PASSTHROUGH)
KDEVOPS_BRING_UP_DEPS := bringup_vagrant
# Provisioning goes last
@@ -93,7 +93,7 @@ vagrant_private_box_install:
vagrant_9p_linux_clone:
$(Q)make linux-clone
-vagrant_libvirt_pcie_passthrough_permissions:
+libvirt_pcie_passthrough_permissions:
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
--inventory localhost, \
playbooks/libvirt_pcie_passthrough.yml \
diff --git a/vagrant/Kconfig b/vagrant/Kconfig
index 3dd6d0cda2b1..3b069d098500 100644
--- a/vagrant/Kconfig
+++ b/vagrant/Kconfig
@@ -2,9 +2,9 @@ if VAGRANT
choice
prompt "Vagrant virtualization technology to use"
- default VAGRANT_LIBVIRT
+ default LIBVIRT
-config VAGRANT_LIBVIRT
+config LIBVIRT
bool "Libvirt"
help
Select this option if you want to use KVM / libvirt for
@@ -22,14 +22,14 @@ config VAGRANT_VIRTUALBOX
endchoice
-config USE_VAGRANT_LIBVIRT_MIRROR
+config USE_LIBVIRT_MIRROR
bool
default y if USE_LOCAL_LINUX_MIRROR
default n if !USE_LOCAL_LINUX_MIRROR
config VAGRANT_LARGE_CPU
bool "Enable extremely large CPU count"
- depends on VAGRANT_LIBVIRT
+ depends on LIBVIRT
help
Select this option if you want to enable larger CPUs
over what most KVM / libvirt configurations allow these days.
@@ -186,7 +186,7 @@ config VAGRANT_MEM_MB
help
How much MiB of RAM to use per guest.
-if VAGRANT_LIBVIRT
+if LIBVIRT
config HAVE_LIBVIRT_PCIE_PASSTHROUGH
bool
@@ -367,7 +367,7 @@ endchoice
choice
prompt "QEMU NVMe extra storage logical block size"
default LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_512
- depends on VAGRANT_LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
+ depends on LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
help
The logical block size to use for extra NVMe drives. This ends up
what is put into the /sys/block/<disk>/queue/logical_block_size (and
@@ -453,7 +453,7 @@ endchoice
choice
prompt "QEMU virtio extra storage physical block size"
- depends on VAGRANT_LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
+ depends on LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
default LIBVIRT_EXTRA_STORAGE_VIRTIO_PHYSICAL_BLOCK_SIZE_512
help
The physical block size to use for extra drive. This ends up
@@ -530,7 +530,7 @@ endchoice
choice
prompt "QEMU virtio extra storage logical block size"
- depends on VAGRANT_LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
+ depends on LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
default LIBVIRT_EXTRA_STORAGE_VIRTIO_LOGICAL_BLOCK_SIZE_512
help
The logical block size to use for extra drives. This ends up what is
@@ -1061,25 +1061,25 @@ config LIBVIRT_QEMU_GROUP
config KDEVOPS_STORAGE_POOL_PATH
string
- default LIBVIRT_STORAGE_POOL_PATH_AUTO if VAGRANT_LIBVIRT && !LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
- default LIBVIRT_STORAGE_POOL_PATH_AUTO if VAGRANT_LIBVIRT && LIBVIRT_STORAGE_POOL_PATH_CUSTOM_CWD
- default LIBVIRT_STORAGE_POOL_PATH_CUSTOM if VAGRANT_LIBVIRT && LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
+ default LIBVIRT_STORAGE_POOL_PATH_AUTO if LIBVIRT && !LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
+ default LIBVIRT_STORAGE_POOL_PATH_AUTO if LIBVIRT && LIBVIRT_STORAGE_POOL_PATH_CUSTOM_CWD
+ default LIBVIRT_STORAGE_POOL_PATH_CUSTOM if LIBVIRT && LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
default VIRTUALBOX_STORAGE_POOL_PATH_CUSTOM if VAGRANT_VIRTUALBOX
config QEMU_BIN_PATH
string
- default QEMU_BIN_PATH_LIBVIRT if VAGRANT_LIBVIRT
- default "/usr/bin/qemu-system-x86_64" if !VAGRANT_LIBVIRT
+ default QEMU_BIN_PATH_LIBVIRT if LIBVIRT
+ default "/usr/bin/qemu-system-x86_64" if !LIBVIRT
config LIBVIRT_URI
string
- default "qemu:///system" if !VAGRANT_LIBVIRT
- default LIBVIRT_URI_PATH if VAGRANT_LIBVIRT
+ default "qemu:///system" if !LIBVIRT
+ default LIBVIRT_URI_PATH if LIBVIRT
config LIBVIRT_SYSTEM_URI
string
- default "qemu:///system" if !VAGRANT_LIBVIRT
- default LIBVIRT_SYSTEM_URI_PATH if VAGRANT_LIBVIRT
+ default "qemu:///system" if !LIBVIRT
+ default LIBVIRT_SYSTEM_URI_PATH if LIBVIRT
config LIBVIRT_SESSION
bool
@@ -1304,7 +1304,7 @@ config VAGRANT_BOX_VERSION
endif # !HAVE_VAGRANT_BOX_VERSION
-config VAGRANT_LIBVIRT_INSTALL
+config LIBVIRT_INSTALL
bool "Install libvirt"
default y if KDEVOPS_FIRST_RUN
default n if !KDEVOPS_FIRST_RUN
@@ -1313,7 +1313,7 @@ config VAGRANT_LIBVIRT_INSTALL
libvirt for you will be run. The goal will be to ensure you have
libvirt installed and running.
-config VAGRANT_LIBVIRT_CONFIGURE
+config LIBVIRT_CONFIGURE
bool "Configure libvirt so you spawn guests as a regular user"
default y if KDEVOPS_FIRST_RUN
default n if !KDEVOPS_FIRST_RUN
@@ -1328,7 +1328,7 @@ config VAGRANT_LIBVIRT_CONFIGURE
the litmus test for this is if you can run vagrant up, on any public
demo box available.
-config VAGRANT_LIBVIRT_VERIFY
+config LIBVIRT_VERIFY
bool "Verify that a user can spawn libvirt as a regular user"
default y if KDEVOPS_FIRST_RUN
default n if !KDEVOPS_FIRST_RUN
@@ -1354,7 +1354,7 @@ config VAGRANT_INSTALL_PRIVATE_BOXES
choice
prompt "Libvirt NVMe drive file format"
- depends on VAGRANT_LIBVIRT
+ depends on LIBVIRT
default LIBVIRT_NVME_DRIVE_FORMAT_RAW
config LIBVIRT_NVME_DRIVE_FORMAT_QCOW2
@@ -1391,7 +1391,7 @@ endchoice
config QEMU_ENABLE_NVME_ZNS
bool "Enable QEMU NVMe ZNS drives"
- depends on VAGRANT_LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
+ depends on LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
default n
help
If this option is enabled then you can enable NVMe ZNS drives on the
@@ -1538,7 +1538,7 @@ config QEMU_NVME_ZONE_LOGICAL_BLOCK_SIZE
config QEMU_ENABLE_EXTRA_DRIVE_LARGEIO
bool "Enable QEMU drives for large IO experimentation"
- depends on VAGRANT_LIBVIRT
+ depends on LIBVIRT
default n
help
If you want to experiment with large IO either with NVMe or virtio
@@ -1669,7 +1669,7 @@ config QEMU_LARGEIO_MAX_POW_LIMIT
config QEMU_ENABLE_CXL
bool "Enable QEMU CXL devices"
- depends on VAGRANT_LIBVIRT
+ depends on LIBVIRT
depends on LIBVIRT_MACHINE_TYPE_Q35
depends on QEMU_USE_DEVELOPMENT_VERSION
default n
diff --git a/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515 b/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515
index bc4f47cf25cd..6eca806ba04b 100644
--- a/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515
+++ b/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515
@@ -38,9 +38,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -110,9 +110,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config
index 78f87387b0f0..7a45735500a4 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config
index 7940bb5a3d8d..7d116643907f 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config
index 78f87387b0f0..7a45735500a4 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config
index 0940704d8657..81be55c6e00e 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231006/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231006/kdevops.config
index df704daf3cd7..32847ddaf4d0 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231006/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231006/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231009/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231009/kdevops.config
index df704daf3cd7..32847ddaf4d0 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231009/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231009/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231011/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231011/kdevops.config
index 582837072c91..1ed75d037a92 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231011/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231011/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231012/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231012/kdevops.config
index 4f770ddea93d..01de380f9df1 100644
--- a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231012/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231012/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/dagomez/xfs/libvirt-qemu/20230522/kdevops.config b/workflows/fstests/results/archive/dagomez/xfs/libvirt-qemu/20230522/kdevops.config
index 5d528a823cd8..6937464d450f 100644
--- a/workflows/fstests/results/archive/dagomez/xfs/libvirt-qemu/20230522/kdevops.config
+++ b/workflows/fstests/results/archive/dagomez/xfs/libvirt-qemu/20230522/kdevops.config
@@ -38,9 +38,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -110,9 +110,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230725/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230725/kdevops.config
index c70f944ecb0b..1f174178896a 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230725/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230725/kdevops.config
@@ -38,9 +38,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -1724,9 +1724,9 @@ CONFIG_VAGRANT_KDEVOPS_DEBIAN_TESTING64_XFS_20230427=y
CONFIG_VAGRANT_BOX="linux-kdevops/debian-xfs-20230427"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230727/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230727/kdevops.config
index 13feaf486ce7..9097c9d9f2ae 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230727/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230727/kdevops.config
@@ -38,9 +38,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -132,9 +132,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230728/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230728/kdevops.config
index 13feaf486ce7..9097c9d9f2ae 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230728/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230728/kdevops.config
@@ -38,9 +38,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -132,9 +132,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230731/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230731/kdevops.config
index 827d7f64c573..68e320322aec 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230731/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230731/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230807/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230807/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230807/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230807/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230811/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230811/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230811/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230811/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230817/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230817/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230817/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230817/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230825/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230825/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230825/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230825/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230828/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230828/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230828/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230828/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230829/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230829/kdevops.config
index 521fde1c6360..fd65bdcbedfe 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230829/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230829/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230903/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230903/kdevops.config
index 9d8035a97478..9bb6df992a44 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230903/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230903/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -137,9 +137,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230909/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230909/kdevops.config
index 52bf584c0044..65d6fcac157c 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230909/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20230909/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -1752,9 +1752,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023-0001/kdevops.config
index e80caf9cd832..71b26e3d1598 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023/kdevops.config
index 574552d4b00f..704d0bfb58c6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231023/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0001/kdevops.config
index 5d9be3f6b7ff..298ccc33a5e6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0002/kdevops.config
index 574552d4b00f..704d0bfb58c6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231024-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0001/kdevops.config
index 574552d4b00f..704d0bfb58c6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0002/kdevops.config
index 5d9be3f6b7ff..298ccc33a5e6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231026-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231027-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231027-0001/kdevops.config
index 574552d4b00f..704d0bfb58c6 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231027-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231027-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0001/kdevops.config
index 4a8b87007025..a4b4b5e0057e 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0002/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0003/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0003/kdevops.config
index e6023f8bb2ae..5c7ec8b58686 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0003/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231030-0003/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0001/kdevops.config
index e6023f8bb2ae..5c7ec8b58686 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0002/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0003/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0003/kdevops.config
index 4a8b87007025..a4b4b5e0057e 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0003/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231101-0003/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0001/kdevops.config
index 4a8b87007025..a4b4b5e0057e 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0002/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231102-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0001/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0002/kdevops.config
index d47107338854..8eded9924a37 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231103-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231104-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231104-0001/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231104-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231104-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231105-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231105-0001/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231105-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231105-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0001/kdevops.config
index e6023f8bb2ae..5c7ec8b58686 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0002/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0002/kdevops.config
index c844814d3837..67f3187d2310 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0002/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0002/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0003/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0003/kdevops.config
index d47107338854..8eded9924a37 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0003/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231106-0003/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231108-0001/kdevops.config b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231108-0001/kdevops.config
index e6023f8bb2ae..5c7ec8b58686 100644
--- a/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231108-0001/kdevops.config
+++ b/workflows/fstests/results/archive/mcgrof/xfs/libvirt-qemu/20231108-0001/kdevops.config
@@ -42,9 +42,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -136,9 +136,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/fstests/results/dagmcr/tmpfs/libvirt-qemu/20231025/kdevops.config b/workflows/fstests/results/dagmcr/tmpfs/libvirt-qemu/20231025/kdevops.config
index 747ee857ea5d..bfe0615f259f 100644
--- a/workflows/fstests/results/dagmcr/tmpfs/libvirt-qemu/20231025/kdevops.config
+++ b/workflows/fstests/results/dagmcr/tmpfs/libvirt-qemu/20231025/kdevops.config
@@ -39,9 +39,9 @@ CONFIG_USE_LOCAL_LINUX_MIRROR=y
CONFIG_VAGRANT=y
# CONFIG_TERRAFORM is not set
# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
+CONFIG_LIBVIRT=y
# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
+CONFIG_USE_LIBVIRT_MIRROR=y
# CONFIG_VAGRANT_LARGE_CPU is not set
# CONFIG_VAGRANT_VCPUS_2 is not set
# CONFIG_VAGRANT_VCPUS_4 is not set
@@ -120,9 +120,9 @@ CONFIG_VAGRANT_DEBIAN_BOX_SHORT="testing64"
CONFIG_VAGRANT_BOX="debian/testing64"
CONFIG_VAGRANT_BOX_UPDATE_ON_BRINGUP=y
CONFIG_VAGRANT_BOX_VERSION=""
-# CONFIG_VAGRANT_LIBVIRT_INSTALL is not set
-# CONFIG_VAGRANT_LIBVIRT_CONFIGURE is not set
-# CONFIG_VAGRANT_LIBVIRT_VERIFY is not set
+# CONFIG_LIBVIRT_INSTALL is not set
+# CONFIG_LIBVIRT_CONFIGURE is not set
+# CONFIG_LIBVIRT_VERIFY is not set
CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES=y
# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
diff --git a/workflows/linux/Kconfig b/workflows/linux/Kconfig
index 88e0f0eab60f..8606f0f8b179 100644
--- a/workflows/linux/Kconfig
+++ b/workflows/linux/Kconfig
@@ -28,7 +28,7 @@ endif # HAVE_SUPPORTS_PURE_IOMAP
config BOOTLINUX_9P
bool "Use 9p to build Linux"
- depends on VAGRANT_LIBVIRT
+ depends on LIBVIRT
depends on LIBVIRT_MACHINE_TYPE_Q35
default LIBVIRT_MACHINE_TYPE_Q35
help
diff --git a/workflows/linux/Kconfig.kdevops b/workflows/linux/Kconfig.kdevops
index b0cef298774f..4cb8388b108e 100644
--- a/workflows/linux/Kconfig.kdevops
+++ b/workflows/linux/Kconfig.kdevops
@@ -14,7 +14,7 @@ endchoice
config BOOTLINUX_TREE_KDEVOPS_URL
string
default "https://github.com/linux-kdevops/linux.git" if !USE_LOCAL_LINUX_MIRROR
- default "/mirror/kdevops-linus.git" if USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "/mirror/kdevops-linus.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
config BOOTLINUX_KDEVOPS_TREE_TAG
string
diff --git a/workflows/linux/Kconfig.linus b/workflows/linux/Kconfig.linus
index 28352e14ee41..b1e03c6a0871 100644
--- a/workflows/linux/Kconfig.linus
+++ b/workflows/linux/Kconfig.linus
@@ -63,8 +63,8 @@ config BOOTLINUX_TREE_LINUS_NAME
config BOOTLINUX_TREE_LINUS_URL
string
default "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git" if !USE_LOCAL_LINUX_MIRROR
- default "git://192.168.124.1/mirror/linux.git" if USE_VAGRANT_LIBVIRT_MIRROR && !BOOTLINUX_9P
- default "/mirror/linux.git" if USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "git://192.168.124.1/mirror/linux.git" if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P
+ default "/mirror/linux.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
endif # BOOTLINUX_TREE_LINUS
diff --git a/workflows/linux/Kconfig.mcgrof b/workflows/linux/Kconfig.mcgrof
index c4720003c6b4..4c4be5b72aff 100644
--- a/workflows/linux/Kconfig.mcgrof
+++ b/workflows/linux/Kconfig.mcgrof
@@ -62,8 +62,8 @@ config BOOTLINUX_MCGROF_TREE_NAME
config BOOTLINUX_MCGROF_TREE_URL
string
default "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux-next.git" if BOOTLINUX_TREE_MCGROF_NEXT && !USE_LOCAL_LINUX_MIRROR
- default "/mirror/mcgrof-next.git" if BOOTLINUX_TREE_MCGROF_NEXT && USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "/mirror/mcgrof-next.git" if BOOTLINUX_TREE_MCGROF_NEXT && USE_LIBVIRT_MIRROR && BOOTLINUX_9P
default "https://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git" if BOOTLINUX_TREE_MCGROF_LINUS && !USE_LOCAL_LINUX_MIRROR
- default "/mirror/mcgrof-linus.git" if BOOTLINUX_TREE_MCGROF_LINUS && USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "/mirror/mcgrof-linus.git" if BOOTLINUX_TREE_MCGROF_LINUS && USE_LIBVIRT_MIRROR && BOOTLINUX_9P
endif # BOOTLINUX_TREE_MCGROF_LINUS || BOOTLINUX_TREE_MCGROF_NEXT
diff --git a/workflows/linux/Kconfig.next b/workflows/linux/Kconfig.next
index ba9eaf31df68..ab839ff9d1cf 100644
--- a/workflows/linux/Kconfig.next
+++ b/workflows/linux/Kconfig.next
@@ -11,7 +11,7 @@ config BOOTLINUX_TREE_NEXT_NAME
config BOOTLINUX_TREE_NEXT_URL
string
default "https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git" if !USE_LOCAL_LINUX_MIRROR
- default "git://192.168.124.1/mirror/linux-next.git" if USE_VAGRANT_LIBVIRT_MIRROR && !BOOTLINUX_9P
- default "/mirror/linux-next.git" if USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "git://192.168.124.1/mirror/linux-next.git" if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P
+ default "/mirror/linux-next.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
endif # BOOTLINUX_TREE_NEXT
diff --git a/workflows/linux/Kconfig.stable b/workflows/linux/Kconfig.stable
index 2d1be22e837d..88fb34cbd8a9 100644
--- a/workflows/linux/Kconfig.stable
+++ b/workflows/linux/Kconfig.stable
@@ -79,7 +79,7 @@ config BOOTLINUX_TREE_STABLE_NAME
config BOOTLINUX_TREE_STABLE_URL
string
default "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git" if !USE_LOCAL_LINUX_MIRROR
- default "git://192.168.124.1/mirror/linux-stable.git" if USE_VAGRANT_LIBVIRT_MIRROR && !BOOTLINUX_9P
- default "/mirror/linux-stable.git" if USE_VAGRANT_LIBVIRT_MIRROR && BOOTLINUX_9P
+ default "git://192.168.124.1/mirror/linux-stable.git" if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P
+ default "/mirror/linux-stable.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
endif # BOOTLINUX_STABLE
--
2.43.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH kdevops v2 2/4] nfsd: key off of LIBVIRT instead of VAGRANT for storage config
2023-12-08 15:01 [PATCH kdevops v2 0/4] guestfs: replacement for vagrant in kdevops Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/ Jeff Layton
@ 2023-12-08 15:01 ` Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 3/4] vagrant: rename the RHEL registration settings Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 4/4] guestfs: add a new local guest management variant Jeff Layton
3 siblings, 0 replies; 12+ messages in thread
From: Jeff Layton @ 2023-12-08 15:01 UTC (permalink / raw)
To: Luis Chamberlain; +Cc: kdevops, Jeff Layton
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
kconfigs/Kconfig.nfsd | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/kconfigs/Kconfig.nfsd b/kconfigs/Kconfig.nfsd
index ceed06ad42a0..0dd28e90ee45 100644
--- a/kconfigs/Kconfig.nfsd
+++ b/kconfigs/Kconfig.nfsd
@@ -1,9 +1,9 @@
# FIXME: need defaults for terraform hosts
config NFSD_EXPORT_DEVICE_0
string "First device to be exported"
- default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops2" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
- default "/dev/disk/by-id/virtio-kdevops2" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
- default "/dev/disk/by-id/ide-kdevops2" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
+ default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops2" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
+ default "/dev/disk/by-id/virtio-kdevops2" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
+ default "/dev/disk/by-id/ide-kdevops2" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
default ""
help
To set up nfsd for testing, we give it filesystems to export. This
@@ -11,9 +11,9 @@ config NFSD_EXPORT_DEVICE_0
config NFSD_EXPORT_DEVICE_1
string "Second device to be exported"
- default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops3" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
- default "/dev/disk/by-id/virtio-kdevops3" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
- default "/dev/disk/by-id/ide-kdevops3" if VAGRANT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
+ default "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops3" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_NVME
+ default "/dev/disk/by-id/virtio-kdevops3" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO
+ default "/dev/disk/by-id/ide-kdevops3" if LIBVIRT && LIBVIRT_EXTRA_STORAGE_DRIVE_IDE
help
To set up nfsd for testing, we give it filesystems to export. This
block device is used as a PV for LVM, and volumes are provisioned from it.
--
2.43.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH kdevops v2 3/4] vagrant: rename the RHEL registration settings
2023-12-08 15:01 [PATCH kdevops v2 0/4] guestfs: replacement for vagrant in kdevops Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/ Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 2/4] nfsd: key off of LIBVIRT instead of VAGRANT for storage config Jeff Layton
@ 2023-12-08 15:01 ` Jeff Layton
2023-12-08 15:23 ` Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 4/4] guestfs: add a new local guest management variant Jeff Layton
3 siblings, 1 reply; 12+ messages in thread
From: Jeff Layton @ 2023-12-08 15:01 UTC (permalink / raw)
To: Luis Chamberlain; +Cc: kdevops, Jeff Layton
Just excise "vagrant" part from them. We might want to use the same
setting for terraform someday in any case.
signed-off-by: Jeff Layton <jlayton@kernel.org>
---
playbooks/roles/devconfig/defaults/main.yml | 4 ++--
playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml | 8 ++++----
playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml | 4 ++--
scripts/vagrant.Makefile | 12 ++++++------
vagrant/Kconfig.fedora | 10 +++++-----
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/playbooks/roles/devconfig/defaults/main.yml b/playbooks/roles/devconfig/defaults/main.yml
index 3eb1af8caee6..42a21a2aca92 100644
--- a/playbooks/roles/devconfig/defaults/main.yml
+++ b/playbooks/roles/devconfig/defaults/main.yml
@@ -41,5 +41,5 @@ devconfig_enable_sysctl_mm_overcommit_memory: False
devconfig_sysctl_conf: "/etc/sysctl.conf"
devconfig_sysctl_mm_overcommit_memory: 0
-vagrant_rhel_org_id: ""
-vagrant_rhel_activation_key: ""
+rhel_org_id: ""
+rhel_activation_key: ""
diff --git a/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml b/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml
index 175bf27c61a3..8426826034e7 100644
--- a/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml
+++ b/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml
@@ -5,12 +5,12 @@
become: yes
community.general.redhat_subscription:
state: present
- org_id: "{{ vagrant_rhel_org_id }}"
- activationkey: "{{ vagrant_rhel_activation_key }}"
+ org_id: "{{ rhel_org_id }}"
+ activationkey: "{{ rhel_activation_key }}"
force_register: true
when:
- - vagrant_rhel_org_id
- - vagrant_rhel_activation_key
+ - rhel_org_id
+ - rhel_activation_key
- name: Check whether custom repofile exists
stat:
diff --git a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
index 7d532b23c6c9..9a133c0da661 100644
--- a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
+++ b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
@@ -3,8 +3,8 @@
become: yes
command: /usr/bin/dnf config-manager --enable codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}-rpms
when:
- - vagrant_rhel_org_id is defined
- - vagrant_rhel_activation_key is defined
+ - rhel_org_id is defined
+ - rhel_activation_key is defined
- name: Install build dependencies for pynfs
become: yes
diff --git a/scripts/vagrant.Makefile b/scripts/vagrant.Makefile
index 48d990321190..a6a74f8755e7 100644
--- a/scripts/vagrant.Makefile
+++ b/scripts/vagrant.Makefile
@@ -56,12 +56,12 @@ ifeq (y,$(CONFIG_KDEVOPS_LIBVIRT_PCIE_PASSTHROUGH))
LIBVIRT_PCIE_PASSTHROUGH := libvirt_pcie_passthrough_permissions
endif
-ifneq ($(strip $(CONFIG_VAGRANT_RHEL_ORG_ID)),)
-ifneq ($(strip $(CONFIG_VAGRANT_RHEL_ACTIVATION_KEY)),)
-RHEL_ORG_ID:=$(subst ",,$(CONFIG_VAGRANT_RHEL_ORG_ID))
-RHEL_ACTIVATION_KEY:=$(subst ",,$(CONFIG_VAGRANT_RHEL_ACTIVATION_KEY))
-VAGRANT_ARGS += vagrant_rhel_org_id="$(RHEL_ORG_ID)"
-VAGRANT_ARGS += vagrant_rhel_activation_key="$(RHEL_ACTIVATION_KEY)"
+ifneq ($(strip $(CONFIG_RHEL_ORG_ID_ORG_ID)),)
+ifneq ($(strip $(CONFIG_RHEL_ORG_ID_ACTIVATION_KEY)),)
+RHEL_ORG_ID:=$(subst ",,$(CONFIG_RHEL_ORG_ID_ORG_ID))
+RHEL_ACTIVATION_KEY:=$(subst ",,$(CONFIG_RHEL_ORG_ID_ACTIVATION_KEY))
+VAGRANT_ARGS += rhel_org_id="$(RHEL_ORG_ID)"
+VAGRANT_ARGS += rhel_activation_key="$(RHEL_ACTIVATION_KEY)"
endif
endif
diff --git a/vagrant/Kconfig.fedora b/vagrant/Kconfig.fedora
index cd5fa5059246..aee5c17f2b3c 100644
--- a/vagrant/Kconfig.fedora
+++ b/vagrant/Kconfig.fedora
@@ -17,7 +17,7 @@ config VAGRANT_FEDORA_OLD_RELEASE
features. Enabling this will disable testing certain
configurations by default in the fstests workflow.
-config VAGRANT_RHEL_REGISTER
+config RHEL_ORG_ID_REGISTER
bool "Register the guests with Red Hat?"
default n
help
@@ -25,16 +25,16 @@ config VAGRANT_RHEL_REGISTER
packages from their core repos. Enable this if you're deploying an official
RHEL cloud image (e.g. generic/rhel9).
-config VAGRANT_RHEL_ORG_ID
+config RHEL_ORG_ID_ORG_ID
string "Red Hat Organization Identifier"
- depends on VAGRANT_RHEL_REGISTER
+ depends on RHEL_ORG_ID_REGISTER
default ""
help
Enter the Red Hat Organizational ID for your subscription here.
-config VAGRANT_RHEL_ACTIVATION_KEY
+config RHEL_ORG_ID_ACTIVATION_KEY
string "Red Hat Activation Key"
- depends on VAGRANT_RHEL_REGISTER
+ depends on RHEL_ORG_ID_REGISTER
default ""
help
Enter the Activation Key to use when registering systems.
--
2.43.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH kdevops v2 4/4] guestfs: add a new local guest management variant
2023-12-08 15:01 [PATCH kdevops v2 0/4] guestfs: replacement for vagrant in kdevops Jeff Layton
` (2 preceding siblings ...)
2023-12-08 15:01 ` [PATCH kdevops v2 3/4] vagrant: rename the RHEL registration settings Jeff Layton
@ 2023-12-08 15:01 ` Jeff Layton
2023-12-09 2:14 ` Luis Chamberlain
3 siblings, 1 reply; 12+ messages in thread
From: Jeff Layton @ 2023-12-08 15:01 UTC (permalink / raw)
To: Luis Chamberlain; +Cc: kdevops, Jeff Layton
The future of Vagrant is somewhat uncertain, so we need to replace it.
This patch adds a new way to manage local guests, using libguestfs-tools:
https://libguestfs.org/
At a high level, this new option mostly affects the "make" and "make
bringup" stages. Instead of using vagrant, it will:
- use gen_nodes to build a nodelist and a libvirt xml file for each
guest (instead of building a Vagrantfile)
- build a base image using virt-builder for a given distro (see
virt-builder -l for the list of options)
- clone that image (using reflink) to a base root image for each guest
- create extra disks for each guest
- define the new guests using the xml file and start them
While no one really loves XML, I think it turns out to be a lot simpler
than trying to template out a ruby script (like we do with the
Vagrantfile.
Not all storage and hardware configurations are yet supported. I'm
hoping others that are using those configurations will help flesh that
out in later patches.
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
Makefile | 4 +
kconfigs/Kconfig.bringup | 6 +
kconfigs/workflows/Kconfig.data_partition | 2 +
playbooks/roles/gen_nodes/defaults/main.yml | 1 +
playbooks/roles/gen_nodes/tasks/main.yml | 30 +++
.../roles/gen_nodes/templates/guestfs_nodes.j2 | 3 +
.../roles/gen_nodes/templates/guestfs_q35.j2.xml | 228 +++++++++++++++++++++
scripts/bringup.Makefile | 1 +
scripts/bringup_guestfs.sh | 92 +++++++++
scripts/destroy_guestfs.sh | 29 +++
scripts/guestfs.Makefile | 88 ++++++++
scripts/update_ssh_config_guestfs.py | 94 +++++++++
vagrant/Kconfig | 51 +++--
13 files changed, 613 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index 895a0a67c705..ef30c3af80d7 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,10 @@ ifeq (y,$(CONFIG_VAGRANT))
include scripts/vagrant.Makefile
endif
+ifeq (y,$(CONFIG_GUESTFS))
+include scripts/guestfs.Makefile
+endif
+
ifeq (y,$(CONFIG_WORKFLOWS))
include workflows/Makefile
endif # CONFIG_WORKFLOWS
diff --git a/kconfigs/Kconfig.bringup b/kconfigs/Kconfig.bringup
index 1eaa2c99dd10..cc3d3eb573ab 100644
--- a/kconfigs/Kconfig.bringup
+++ b/kconfigs/Kconfig.bringup
@@ -15,6 +15,12 @@ config VAGRANT
make deps
+config GUESTFS
+ bool "Use guestfs-tools for local virtualization via KVM and libvirt (EXPERIMENTAL)"
+ help
+ This option will use libguestfs utilities instead of Vagrant to build
+ guest images and spin them up using libvirt with KVM.
+
config TERRAFORM
bool "Terraform for cloud environments"
select EXTRA_STORAGE_SUPPORTS_512
diff --git a/kconfigs/workflows/Kconfig.data_partition b/kconfigs/workflows/Kconfig.data_partition
index 8dd16ae78698..3a6b0ac6251e 100644
--- a/kconfigs/workflows/Kconfig.data_partition
+++ b/kconfigs/workflows/Kconfig.data_partition
@@ -71,6 +71,7 @@ if !WORKFLOW_INFER_USER_AND_GROUP
config WORKFLOW_DATA_USER
string "The username to use to chown on the target data workflow directory"
+ default "kdevops" if GUESTFS
default "vagrant" if VAGRANT
default TERRAFORM_SSH_CONFIG_USER if TERRAFORM
help
@@ -78,6 +79,7 @@ config WORKFLOW_DATA_USER
config WORKFLOW_DATA_GROUP
string "The group to use to chown on the target data workflow directory"
+ default "kdevops" if GUESTFS
default "vagrant" if VAGRANT
default TERRAFORM_SSH_CONFIG_USER if TERRAFORM_AWS_AMI_DEBIAN || TERRAFORM_AZURE_IMAGE_PUBLISHER_DEBIAN
default "users" if !TERRAFORM_AWS_AMI_DEBIAN && !TERRAFORM_AZURE_IMAGE_PUBLISHER_DEBIAN
diff --git a/playbooks/roles/gen_nodes/defaults/main.yml b/playbooks/roles/gen_nodes/defaults/main.yml
index e1e675cb38d0..6ed914f479c7 100644
--- a/playbooks/roles/gen_nodes/defaults/main.yml
+++ b/playbooks/roles/gen_nodes/defaults/main.yml
@@ -1,5 +1,6 @@
# SPDX-License-Identifier GPL-2.0+
---
+kdevops_enable_guestfs: False
kdevops_enable_terraform: False
kdevops_enable_vagrant: False
kdevops_vagrant: '/dev/null'
diff --git a/playbooks/roles/gen_nodes/tasks/main.yml b/playbooks/roles/gen_nodes/tasks/main.yml
index 7beea670f0e3..0271fce34900 100644
--- a/playbooks/roles/gen_nodes/tasks/main.yml
+++ b/playbooks/roles/gen_nodes/tasks/main.yml
@@ -18,6 +18,12 @@
command: "id -g -n"
register: my_group
+- name: Create guestfs directory
+ ansible.builtin.file:
+ path: "{{ guestfs_path }}"
+ state: directory
+ when: kdevops_enable_guestfs
+
- name: Verify Ansible nodes template file exists {{ kdevops_nodes_template_full_path }}
stat:
path: "{{ kdevops_nodes_template_full_path }}"
@@ -350,3 +356,27 @@
- kdevops_enable_vagrant|bool
- vagrant_template.stat.exists
- not vagrant_dest.stat.exists
+
+- name: Import list of guest nodes
+ include_vars: "{{ topdir_path }}/{{ kdevops_nodes }}"
+ ignore_errors: yes
+ when:
+ - kdevops_enable_guestfs
+
+- name: Create local directories for each of the guests
+ ansible.builtin.file:
+ path: "{{ guestfs_path }}/{{ item.name }}"
+ state: directory
+ with_items: "{{ guestfs_nodes }}"
+ when: kdevops_enable_guestfs
+
+- name: Generate XML files for the libvirt guests
+ vars:
+ cur_hostname: "{{ item.name }}"
+ template:
+ src: "guestfs_{{ libvirt_machine_type }}.j2.xml"
+ dest: "{{ topdir_path }}/guestfs/{{ cur_hostname }}/{{ cur_hostname }}.xml"
+ force: yes
+ with_items: "{{ guestfs_nodes }}"
+ when:
+ - kdevops_enable_guestfs
diff --git a/playbooks/roles/gen_nodes/templates/guestfs_nodes.j2 b/playbooks/roles/gen_nodes/templates/guestfs_nodes.j2
new file mode 100644
index 000000000000..5e87df3bafff
--- /dev/null
+++ b/playbooks/roles/gen_nodes/templates/guestfs_nodes.j2
@@ -0,0 +1,3 @@
+---
+guestfs_nodes:
+{% include './templates/hosts.j2' %}
diff --git a/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml b/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml
new file mode 100644
index 000000000000..527b44b90e89
--- /dev/null
+++ b/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml
@@ -0,0 +1,228 @@
+<domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'>
+ <name>{{ cur_hostname }}</name>
+ <memory unit='MiB'>{{ vagrant_mem_mb }}</memory>
+ <currentMemory unit='MiB'>{{ vagrant_mem_mb }}</currentMemory>
+ <vcpu placement='static'>{{ vagrant_vcpus_count }}</vcpu>
+ <os>
+ <type arch='x86_64' machine='pc-q35-8.1'>hvm</type>
+ <boot dev='hd'/>
+ </os>
+ <features>
+ <acpi/>
+ <apic/>
+ </features>
+ <cpu mode='host-passthrough' check='none' migratable='on'/>
+ <clock offset='utc'>
+ <timer name='rtc' tickpolicy='catchup'/>
+ <timer name='pit' tickpolicy='delay'/>
+ <timer name='hpet' present='no'/>
+ </clock>
+ <on_poweroff>destroy</on_poweroff>
+ <on_reboot>restart</on_reboot>
+ <on_crash>destroy</on_crash>
+ <pm>
+ <suspend-to-mem enabled='no'/>
+ <suspend-to-disk enabled='no'/>
+ </pm>
+ <devices>
+ <emulator>/usr/bin/qemu-system-x86_64</emulator>
+ <disk type='file' device='disk'>
+ <driver name='qemu' type='qcow2'/>
+ <source file='{{ kdevops_storage_pool_path }}/guestfs/{{ cur_hostname }}/root.qcow2' index='1'/>
+ <backingStore/>
+ <target dev='vda' bus='virtio'/>
+ <alias name='virtio-disk0'/>
+ <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
+ </disk>
+ <controller type='usb' index='0' model='qemu-xhci' ports='15'>
+ <alias name='usb'/>
+ <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
+ </controller>
+ <controller type='pci' index='0' model='pcie-root'>
+ <alias name='pcie.0'/>
+ </controller>
+ <controller type='pci' index='1' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='1' port='0x8'/>
+ <alias name='pci.1'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/>
+ </controller>
+ <controller type='pci' index='2' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='2' port='0x9'/>
+ <alias name='pci.2'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+ </controller>
+ <controller type='pci' index='3' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='3' port='0xa'/>
+ <alias name='pci.3'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+ </controller>
+ <controller type='pci' index='4' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='4' port='0xb'/>
+ <alias name='pci.4'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/>
+ </controller>
+ <controller type='pci' index='5' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='5' port='0xc'/>
+ <alias name='pci.5'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x4'/>
+ </controller>
+ <controller type='pci' index='6' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='6' port='0xd'/>
+ <alias name='pci.6'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x5'/>
+ </controller>
+ <controller type='pci' index='7' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='7' port='0xe'/>
+ <alias name='pci.7'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x6'/>
+ </controller>
+ <controller type='pci' index='8' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='8' port='0xf'/>
+ <alias name='pci.8'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x7'/>
+ </controller>
+ <controller type='pci' index='9' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='9' port='0x10'/>
+ <alias name='pci.9'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
+ </controller>
+ <controller type='pci' index='10' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='10' port='0x11'/>
+ <alias name='pci.10'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
+ </controller>
+ <controller type='pci' index='11' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='11' port='0x12'/>
+ <alias name='pci.11'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
+ </controller>
+ <controller type='pci' index='12' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='12' port='0x13'/>
+ <alias name='pci.12'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
+ </controller>
+ <controller type='pci' index='13' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='13' port='0x14'/>
+ <alias name='pci.13'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
+ </controller>
+ <controller type='pci' index='14' model='pcie-root-port'>
+ <model name='pcie-root-port'/>
+ <target chassis='14' port='0x15'/>
+ <alias name='pci.14'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
+ </controller>
+ <controller type='sata' index='0'>
+ <alias name='ide'/>
+ <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
+ </controller>
+ <controller type='virtio-serial' index='0'>
+ <alias name='virtio-serial0'/>
+ <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
+ </controller>
+ <interface type='bridge'>
+ <source bridge='virbr0'/>
+ <target dev='tap0'/>
+ <model type='virtio'/>
+ <alias name='net0'/>
+ <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
+ </interface>
+ <serial type='pty'>
+ <source path='/dev/pts/2'/>
+ <target type='isa-serial' port='0'>
+ <model name='isa-serial'/>
+ </target>
+ <alias name='serial0'/>
+ </serial>
+ <console type='pty' tty='/dev/pts/2'>
+ <source path='/dev/pts/2'/>
+ <target type='serial' port='0'/>
+ <alias name='serial0'/>
+ </console>
+ <channel type='unix'>
+ <source mode='bind'/>
+ <target type='virtio' name='org.qemu.guest_agent.0' state='connected'/>
+ <alias name='channel0'/>
+ <address type='virtio-serial' controller='0' bus='0' port='1'/>
+ </channel>
+ <input type='mouse' bus='ps2'>
+ <alias name='input0'/>
+ </input>
+ <input type='keyboard' bus='ps2'>
+ <alias name='input1'/>
+ </input>
+ <audio id='1' type='none'/>
+ <watchdog model='itco' action='reset'>
+ <alias name='watchdog0'/>
+ </watchdog>
+ <memballoon model='virtio'>
+ <alias name='balloon0'/>
+ <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
+ </memballoon>
+ <rng model='virtio'>
+ <backend model='random'>/dev/urandom</backend>
+ <alias name='rng0'/>
+ <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
+ </rng>
+ </devices>
+ <seclabel type='dynamic' model='selinux' relabel='yes'>
+ <label>unconfined_u:unconfined_r:svirt_t:s0:c279,c814</label>
+ <imagelabel>unconfined_u:object_r:svirt_image_t:s0:c279,c814</imagelabel>
+ </seclabel>
+ <qemu:commandline>
+ <qemu:arg value='-global'/>
+ <qemu:arg value='ICH9-LPC.disable_s3=0'/>
+ <qemu:arg value='-global'/>
+ <qemu:arg value='ICH9-LPC.disable_s4=0'/>
+ <qemu:arg value='-device'/>
+ <qemu:arg value='pxb-pcie,id=pcie.1,bus_nr=32,bus=pcie.0,addr=0x8'/>
+{% if libvirt_extra_storage_drive_ide %}
+{% for n in range(0,4) %}
+ <qemu:arg value='-drive'/>
+ <qemu:arg value='file={{ kdevops_storage_pool_path }}/guestfs/{{ cur_hostname }}/extra{{ n }}.{{ vagrant_extra_drive_format }},format={{ vagrant_extra_drive_format }},aio={{ libvirt_extra_storage_aio_mode }},cache={{ libvirt_extra_storage_aio_cache_mode }},if=ide,serial=kdevops{{ n }}'/>
+{% endfor %}
+{% elif libvirt_extra_storage_drive_virtio %}
+{% for n in range(0,4) %}
+ <qemu:arg value='-device'/>
+ <qemu:arg value='pcie-root-port,id=pcie-port-for-virtio-{{ n }},multifunction=on,bus=pcie.1,addr=0x{{ n }},chassis=5{{ n }}'/>
+ <qemu:arg value="-object"/>
+ <qemu:arg value="iothread,id=kdevops-virtio-iothread-{{ n }}"/>
+ <qemu:arg value="-drive"/>
+ <qemu:arg value="file={{ kdevops_storage_pool_path }}/guestfs/{{ cur_hostname }}/extra{{ n }}.{{ vagrant_extra_drive_format }},format={{ vagrant_extra_drive_format }},if=none,aio={{ libvirt_extra_storage_aio_mode }},cache={{ libvirt_extra_storage_aio_cache_mode }},id=drv{{ n }}"/>
+ <qemu:arg value="-device"/>
+ <qemu:arg value="virtio-blk-pci,scsi=off,drive=drv{{ n }},id=virtio-drv{{ n }},serial=kdevops{{ n }},bus=pcie-port-for-virtio-{{ n }},addr=0x0,iothread=kdevops-virtio-iothread-{{ n }},logical_block_size={{ libvirt_extra_storage_virtio_logical_block_size }},physical_block_size={{ libvirt_extra_storage_virtio_physical_block_size }}"/>
+{% endfor %}
+{% elif libvirt_extra_storage_drive_nvme %}
+{% for n in range(0,4) %}
+ <qemu:arg value='-device'/>
+ <qemu:arg value='pcie-root-port,id=pcie-port-for-nvme-{{ n }},multifunction=on,bus=pcie.1,addr=0x{{ n }},chassis=5{{ n }}'/>
+ <qemu:arg value='-drive'/>
+ <qemu:arg value='file={{ kdevops_storage_pool_path }}/guestfs/{{ cur_hostname }}/extra{{ n }}.{{ vagrant_extra_drive_format }},format={{ vagrant_extra_drive_format }},if=none,id=drv{{ n }}'/>
+ <qemu:arg value='-device'/>
+ <qemu:arg value='nvme,id=nvme{{ n }},serial=kdevops{{ n }},bus=pcie-port-for-nvme-{{ n }},addr=0x0'/>
+ <qemu:arg value='-device'/>
+ <qemu:arg value='nvme-ns,drive=drv{{ n }},bus=nvme{{ n }},nsid=1,logical_block_size=512,physical_block_size=512'/>
+{% endfor %}
+{% endif %}
+{% if bootlinux_9p %}
+ <qemu:arg value='-device'/>
+ <qemu:arg value='{{ bootlinux_9p_driver }},fsdev={{ bootlinux_9p_fsdev }},mount_tag={{ bootlinux_9p_mount_tag }},bus=pcie.0,addr=0x10'/>
+ <qemu:arg value='-fsdev'/>
+ <qemu:arg value='local,id={{ bootlinux_9p_fsdev }},path={{ bootlinux_9p_host_path }},security_model={{ bootlinux_9p_security_model }}'/>
+{% endif %}
+ </qemu:commandline>
+</domain>
+
diff --git a/scripts/bringup.Makefile b/scripts/bringup.Makefile
index 2219cb3f4342..d7a07f0becb7 100644
--- a/scripts/bringup.Makefile
+++ b/scripts/bringup.Makefile
@@ -33,6 +33,7 @@ bringup-help-menu:
@echo "Bringup targets:"
@echo "bringup - Brings up target hosts"
@echo "destroy - Destroy all target hosts"
+ @echo "cleancache - Remove all cached images"
@echo ""
HELP_TARGETS+=bringup-help-menu
diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh
new file mode 100755
index 000000000000..2f2406dc054d
--- /dev/null
+++ b/scripts/bringup_guestfs.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+# SPDX-License-Identifier: copyleft-next-0.3.1
+
+[ -z "${TOPDIR}" ] && TOPDIR='.'
+source ${TOPDIR}/.config
+source ${TOPDIR}/scripts/lib.sh
+
+#
+# We use the NVMe setting for virtio too (go figure), but IDE
+# requires qcow2
+#
+IMG_FMT="qcow2"
+if [ "${CONFIG_LIBVIRT_EXTRA_STORAGE_DRIVE_IDE}" != "y" -a \
+ "${CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW}" = "y" ]; then
+ IMG_FMT="raw"
+fi
+STORAGEDIR="${CONFIG_KDEVOPS_STORAGE_POOL_PATH}/kdevops/guestfs"
+GUESTFSDIR="${TOPDIR}/guestfs"
+OS_VERSION=${CONFIG_VIRT_BUILDER_OS_VERSION}
+BASE_IMAGE_DIR="${STORAGEDIR}/base_images"
+BASE_IMAGE="${BASE_IMAGE_DIR}/${OS_VERSION}.qcow2"
+mkdir -p $STORAGEDIR
+mkdir -p $BASE_IMAGE_DIR
+
+cmdfile=$(mktemp)
+
+if [ ! -f $BASE_IMAGE ]; then
+
+# basic pre-install customization
+ cat <<_EOT >>$cmdfile
+install sudo,qemu-guest-agent
+run-command useradd -m kdevops
+append-line /etc/sudoers.d/kdevops:kdevops ALL=(ALL) NOPASSWD: ALL
+_EOT
+
+# Ugh, debian has to be told to bring up the network and regenerate ssh keys
+# Hope we get that interface name right!
+ if echo $OS_VERSION | grep -q '^debian'; then
+ cat <<_EOT >>$cmdfile
+append-line /etc/network/interfaces.d/enp1s0:auto enp1s0
+append-line /etc/network/interfaces.d/enp1s0:allow-hotplug enp1s0
+append-line /etc/network/interfaces.d/enp1s0:iface enp1s0 inet dhcp
+firstboot-command dpkg-reconfigure openssh-server
+_EOT
+ fi
+
+ #
+ # Note that we always use qcow2 for the base image.
+ #
+ echo "Generating new base image for ${OS_VERSION}"
+ virt-builder ${OS_VERSION} -o $BASE_IMAGE --format qcow2 --commands-from-file $cmdfile
+fi
+
+# FIXME: is there a yaml equivalent of jq?
+grep -e '^ - name: ' ${TOPDIR}/guestfs/kdevops_nodes.yaml | sed 's/^ - name: //' | while read name
+do
+ #
+ # If the guest is already defined, then just stop what we're doing
+ # and plead to the developer to clean things up.
+ #
+ virsh domstate $name 1>/dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ echo "Domain $name is already defined. Aborting!"
+ exit 1
+ fi
+
+ SSH_KEY_DIR="${GUESTFSDIR}/$name/ssh"
+ SSH_KEY="${SSH_KEY_DIR}/id_ed25519"
+
+ # Generate a new ssh key
+ mkdir -p "$SSH_KEY_DIR"
+ chmod 0700 "$SSH_KEY_DIR"
+ rm -f $SSH_KEY $SSH_KEY.pub
+ ssh-keygen -q -t ed25519 -f $SSH_KEY -N ""
+
+ mkdir -p "$STORAGEDIR/$name"
+
+ # Copy the base image and prep it
+ ROOTIMG="$STORAGEDIR/$name/root.qcow2"
+ cp --reflink=auto $BASE_IMAGE $ROOTIMG
+ virt-sysprep -a $ROOTIMG --hostname $name --ssh-inject "kdevops:file:$SSH_KEY.pub"
+
+ # build some extra disks
+ for i in $(seq 0 3); do
+ diskimg="$STORAGEDIR/$name/extra${i}.${IMG_FMT}"
+ rm -f $diskimg
+ qemu-img create -f $IMG_FMT "$STORAGEDIR/$name/extra${i}.$IMG_FMT" 100G
+ done
+
+ virsh define $GUESTFSDIR/$name/$name.xml
+ virsh start $name
+done
diff --git a/scripts/destroy_guestfs.sh b/scripts/destroy_guestfs.sh
new file mode 100755
index 000000000000..4512dc07246b
--- /dev/null
+++ b/scripts/destroy_guestfs.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# SPDX-License-Identifier: copyleft-next-0.3.1
+
+[ -z "${TOPDIR}" ] && TOPDIR='.'
+source ${TOPDIR}/.config
+source ${TOPDIR}/scripts/lib.sh
+
+STORAGEDIR="${CONFIG_KDEVOPS_STORAGE_POOL_PATH}/kdevops/guestfs"
+GUESTFSDIR="${TOPDIR}/guestfs"
+
+if [ -f "$GUESTFSDIR/kdevops_nodes.yaml" ]; then
+ # FIXME: is there a yaml equivalent to jq ?
+ grep -e '^ - name: ' "${GUESTFSDIR}/kdevops_nodes.yaml" | sed 's/^ - name: //' | while read name
+ do
+ domstate=$(virsh domstate $name 2>/dev/null)
+ if [ $? -eq 0 ]; then
+ if [ "$domstate" = 'running' ]; then
+ virsh destroy $name
+ fi
+ virsh undefine $name
+ fi
+ rm -rf "$GUESTFSDIR/$name"
+ rm -rf "$STORAGEDIR/$name"
+ done
+fi
+
+rm -f ~/.ssh/config_kdevops_$CONFIG_KDEVOPS_HOSTS_PREFIX
+rm -f $GUESTFSDIR/.provisioned_once
+rm -f $GUESTFSDIR/kdevops_nodes.yaml
diff --git a/scripts/guestfs.Makefile b/scripts/guestfs.Makefile
new file mode 100644
index 000000000000..958063d5eeef
--- /dev/null
+++ b/scripts/guestfs.Makefile
@@ -0,0 +1,88 @@
+# SPDX-License-Identifier: copyleft-next-0.3.1
+
+GUESTFS_ARGS :=
+
+KDEVOPS_NODES_TEMPLATE := $(KDEVOPS_NODES_ROLE_TEMPLATE_DIR)/guestfs_nodes.j2
+KDEVOPS_NODES := guestfs/kdevops_nodes.yaml
+
+export KDEVOPS_GUESTFS_PROVISIONED := guestfs/.provisioned_once
+
+KDEVOPS_MRPROPER += $(KDEVOPS_GUESTFS_PROVISIONED)
+
+GUESTFS_ARGS += kdevops_enable_guestfs=True
+GUESTFS_ARGS += guestfs_path='$(TOPDIR_PATH)/guestfs'
+GUESTFS_ARGS += data_home_dir=/home/kdevops
+GUESTFS_ARGS += virtbuilder_os_version=$(CONFIG_VIRT_BUILDER_OS_VERSION)
+GUESTFS_ARGS += kdevops_storage_pool_user='$(USER)'
+
+GUESTFS_ARGS += libvirt_provider=True
+
+QEMU_GROUP:=$(subst ",,$(CONFIG_LIBVIRT_QEMU_GROUP))
+GUESTFS_ARGS += kdevops_storage_pool_group='$(QEMU_GROUP)'
+GUESTFS_ARGS += storage_pool_group='$(QEMU_GROUP)'
+
+STORAGE_POOL_PATH:=$(subst ",,$(CONFIG_KDEVOPS_STORAGE_POOL_PATH))
+KDEVOPS_STORAGE_POOL_PATH:=$(STORAGE_POOL_PATH)/kdevops
+GUESTFS_ARGS += storage_pool_path=$(STORAGE_POOL_PATH)
+GUESTFS_ARGS += kdevops_storage_pool_path=$(KDEVOPS_STORAGE_POOL_PATH)
+
+9P_HOST_CLONE :=
+ifeq (y,$(CONFIG_BOOTLINUX_9P))
+9P_HOST_CLONE := 9p_linux_clone
+endif
+
+LIBVIRT_PCIE_PASSTHROUGH :=
+ifeq (y,$(CONFIG_KDEVOPS_LIBVIRT_PCIE_PASSTHROUGH))
+LIBVIRT_PCIE_PASSTHROUGH := libvirt_pcie_passthrough_permissions
+endif
+
+ifneq ($(strip $(CONFIG_RHEL_ORG_ID)),)
+ifneq ($(strip $(CONFIG_RHEL_ACTIVATION_KEY)),)
+RHEL_ORG_ID:=$(subst ",,$(CONFIG_RHEL_ORG_ID))
+RHEL_ACTIVATION_KEY:=$(subst ",,$(CONFIG_RHEL_ACTIVATION_KEY))
+GUESTFS_ARGS += rhel_org_id="$(RHEL_ORG_ID)"
+GUESTFS_ARGS += rhel_activation_key="$(RHEL_ACTIVATION_KEY)"
+endif
+endif
+
+ANSIBLE_EXTRA_ARGS += $(GUESTFS_ARGS)
+
+GUESTFS_BRINGUP_DEPS :=
+GUESTFS_BRINGUP_DEPS += $(9P_HOST_CLONE)
+GUESTFS_BRINGUP_DEPS += $(LIBVIRT_PCIE_PASSTHROUGH)
+
+KDEVOPS_BRING_UP_DEPS := bringup_guestfs
+KDEVOPS_DESTROY_DEPS := destroy_guestfs
+
+# Provisioning goes last
+KDEVOPS_BRING_UP_DEPS += $(KDEVOPS_GUESTFS_PROVISIONED)
+
+9p_linux_clone:
+ $(Q)make linux-clone
+
+libvirt_pcie_passthrough_permissions:
+ $(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
+ --inventory localhost, \
+ playbooks/libvirt_pcie_passthrough.yml \
+ -e 'ansible_python_interpreter=/usr/bin/python3'
+
+$(KDEVOPS_GUESTFS_PROVISIONED):
+ $(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \
+ $(TOPDIR)/scripts/update_ssh_config_guestfs.py; \
+ fi
+ $(Q)if [[ "$(CONFIG_KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK)" != "" ]]; then \
+ ansible-playbook $(ANSIBLE_VERBOSE) -i \
+ $(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/$(KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK) ; \
+ fi
+ $(Q)touch $(KDEVOPS_GUESTFS_PROVISIONED)
+
+bringup_guestfs: $(GUESTFS_BRINGUP_DEPS)
+ $(Q)$(TOPDIR)/scripts/bringup_guestfs.sh
+PHONY += bringup_guestfs
+
+destroy_guestfs:
+ $(Q)$(TOPDIR)/scripts/destroy_guestfs.sh
+PHONY += destroy_guestfs
+
+cleancache:
+ $(Q)rm -f $(subst ",,$(CONFIG_KDEVOPS_STORAGE_POOL_PATH))/kdevops/guestfs/base_images/*
diff --git a/scripts/update_ssh_config_guestfs.py b/scripts/update_ssh_config_guestfs.py
new file mode 100755
index 000000000000..ebf49b8b09b4
--- /dev/null
+++ b/scripts/update_ssh_config_guestfs.py
@@ -0,0 +1,94 @@
+#!/usr/bin/python3
+#
+# update_ssh_config_guestfs
+#
+# For each kdevops guest, determine the IP address and write a ssh_config
+# entry for it to ~/.ssh/config_kdevops_$prefix. Users can then just add a
+# line like this to ~/.ssh/config:
+#
+# Include ~/.ssh/config_kdevops_*
+#
+
+import yaml
+import json
+import sys
+import pprint
+import subprocess
+import time
+import os
+from pathlib import Path
+
+ssh_template = """Host {name} {addr}
+ HostName {addr}
+ User kdevops
+ Port 22
+ IdentityFile {sshkey}
+ UserKnownHostsFile /dev/null
+ StrictHostKeyChecking no
+ PasswordAuthentication no
+ IdentitiesOnly yes
+ LogLevel FATAL
+"""
+
+# We take the first IPv4 address on the first non-loopback interface.
+def get_addr(name):
+ attempt = 0
+ while True:
+ attempt += 1
+ if attempt > 60:
+ raise Exception(f"Unable to get an address for {name} after 60s")
+
+ result = subprocess.run(['/usr/bin/virsh','qemu-agent-command',name,'{"execute":"guest-network-get-interfaces"}'], capture_output=True)
+ # Did it error out? Sleep and try again.
+ if result.returncode != 0:
+ time.sleep(1)
+ continue
+
+ # slurp the output into a dict
+ netinfo = json.loads(result.stdout)
+
+ ret = None
+ for iface in netinfo['return']:
+ if iface['name'] == 'lo':
+ continue
+ if 'ip-addresses' not in iface:
+ continue
+ for addr in iface['ip-addresses']:
+ if addr['ip-address-type'] != 'ipv4':
+ continue
+ ret = addr['ip-address']
+ break
+
+ # If we didn't get an address, try again
+ if ret:
+ return ret
+ time.sleep(1)
+
+def main():
+ topdir = os.environ.get('TOPDIR', '.')
+
+ # load extra_vars
+ with open(f'{topdir}/extra_vars.yaml') as stream:
+ extra_vars = yaml.safe_load(stream)
+
+ # slurp in the guestfs_nodes list
+ with open(f'{topdir}/{extra_vars["kdevops_nodes"]}') as stream:
+ nodes = yaml.safe_load(stream)
+
+ ssh_config = f'{Path.home()}/.ssh/config_kdevops_{extra_vars["kdevops_host_prefix"]}'
+
+ # make a stanza for each node
+ sshconf = open(ssh_config, 'w')
+ for node in nodes['guestfs_nodes']:
+ name = node['name']
+ addr = get_addr(name)
+ context = {
+ "name" : name,
+ "addr" : addr,
+ "sshkey" : f"{extra_vars['guestfs_path']}/{name}/ssh/id_ed25519"
+ }
+ sshconf.write(ssh_template.format(**context))
+ sshconf.close()
+
+if __name__ == "__main__":
+ main()
diff --git a/vagrant/Kconfig b/vagrant/Kconfig
index 3b069d098500..04c8556a5bff 100644
--- a/vagrant/Kconfig
+++ b/vagrant/Kconfig
@@ -1,10 +1,11 @@
-if VAGRANT
+if VAGRANT || GUESTFS
+if ! GUESTFS
choice
prompt "Vagrant virtualization technology to use"
- default LIBVIRT
+ default VAGRANT_LIBVIRT_SELECT
-config LIBVIRT
+config VAGRANT_LIBVIRT_SELECT
bool "Libvirt"
help
Select this option if you want to use KVM / libvirt for
@@ -21,6 +22,12 @@ config VAGRANT_VIRTUALBOX
local virtualization.
endchoice
+endif # !GUESTFS
+
+config LIBVIRT
+ bool
+ depends on GUESTFS || VAGRANT_LIBVIRT_SELECT
+ default y
config USE_LIBVIRT_MIRROR
bool
@@ -1103,6 +1110,18 @@ config LIBVIRT_SESSION_PUBLIC_NETWORK_DEV
endif # LIBVIRT_SESSION
+if GUESTFS
+config VIRT_BUILDER_OS_VERSION
+ string "virt-builder os-version"
+ default "fedora-39"
+ help
+ Have virt-builder use this os-version string to
+ build a root image for the guest. Run "virt-builder -l"
+ to get a list of operating systems and versions supported
+ by guestfs.
+endif # GUESTFS
+
+if ! GUESTFS
config HAVE_SUSE_VAGRANT
bool
default $(shell, scripts/check_distro_kconfig.sh suse)
@@ -1183,7 +1202,6 @@ config VAGRANT_KDEVOPS
help
This option will let you select custom kernel builds by the
kdevops project. The distributions may vary and are are specified.
-
endchoice
config HAVE_VAGRANT_BOX_VERSION
@@ -1264,7 +1282,6 @@ config VAGRANT_PREFERRED_KERNEL_CI_SUBJECT_TOPIC
default VAGRANT_BOX if VAGRANT_DEBIAN_BUSTER64
default VAGRANT_BOX if VAGRANT_DEBIAN_BULLSEYE64
-
config HAVE_VAGRANT_BOX_URL
bool
@@ -1304,6 +1321,19 @@ config VAGRANT_BOX_VERSION
endif # !HAVE_VAGRANT_BOX_VERSION
+config VAGRANT_INSTALL_PRIVATE_BOXES
+ bool "Install private Vagrant boxes"
+ default y
+ help
+ If this option is enabled then the Ansible role which installs
+ additional Vagrant boxes will be run. This is useful if for example,
+ you have private Vagrant boxes available and you want to use them.
+ You can safely disable this option if you are using only public
+ Vagrant boxes. Enabling this option is safe as well, given no
+ private boxes would be defined, and so nothing is done.
+
+endif # !GUESTFS
+
config LIBVIRT_INSTALL
bool "Install libvirt"
default y if KDEVOPS_FIRST_RUN
@@ -1341,17 +1371,6 @@ config LIBVIRT_VERIFY
verify and ensure that your user is already part of these groups.
You can safely say yes here.
-config VAGRANT_INSTALL_PRIVATE_BOXES
- bool "Install private Vagrant boxes"
- default y
- help
- If this option is enabled then the Ansible role which installs
- additional Vagrant boxes will be run. This is useful if for example,
- you have private Vagrant boxes available and you want to use them.
- You can safely disable this option if you are using only public
- Vagrant boxes. Enabling this option is safe as well, given no
- private boxes would be defined, and so nothing is done.
-
choice
prompt "Libvirt NVMe drive file format"
depends on LIBVIRT
--
2.43.0
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH kdevops v2 3/4] vagrant: rename the RHEL registration settings
2023-12-08 15:01 ` [PATCH kdevops v2 3/4] vagrant: rename the RHEL registration settings Jeff Layton
@ 2023-12-08 15:23 ` Jeff Layton
0 siblings, 0 replies; 12+ messages in thread
From: Jeff Layton @ 2023-12-08 15:23 UTC (permalink / raw)
To: Luis Chamberlain; +Cc: kdevops
On Fri, 2023-12-08 at 10:01 -0500, Jeff Layton wrote:
> Just excise "vagrant" part from them. We might want to use the same
> setting for terraform someday in any case.
>
> signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
> playbooks/roles/devconfig/defaults/main.yml | 4 ++--
> playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml | 8 ++++----
> playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml | 4 ++--
> scripts/vagrant.Makefile | 12 ++++++------
> vagrant/Kconfig.fedora | 10 +++++-----
> 5 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/playbooks/roles/devconfig/defaults/main.yml b/playbooks/roles/devconfig/defaults/main.yml
> index 3eb1af8caee6..42a21a2aca92 100644
> --- a/playbooks/roles/devconfig/defaults/main.yml
> +++ b/playbooks/roles/devconfig/defaults/main.yml
> @@ -41,5 +41,5 @@ devconfig_enable_sysctl_mm_overcommit_memory: False
> devconfig_sysctl_conf: "/etc/sysctl.conf"
> devconfig_sysctl_mm_overcommit_memory: 0
>
> -vagrant_rhel_org_id: ""
> -vagrant_rhel_activation_key: ""
> +rhel_org_id: ""
> +rhel_activation_key: ""
> diff --git a/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml b/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml
> index 175bf27c61a3..8426826034e7 100644
> --- a/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml
> +++ b/playbooks/roles/devconfig/tasks/install-deps/redhat/main.yml
> @@ -5,12 +5,12 @@
> become: yes
> community.general.redhat_subscription:
> state: present
> - org_id: "{{ vagrant_rhel_org_id }}"
> - activationkey: "{{ vagrant_rhel_activation_key }}"
> + org_id: "{{ rhel_org_id }}"
> + activationkey: "{{ rhel_activation_key }}"
> force_register: true
> when:
> - - vagrant_rhel_org_id
> - - vagrant_rhel_activation_key
> + - rhel_org_id
> + - rhel_activation_key
>
> - name: Check whether custom repofile exists
> stat:
> diff --git a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
> index 7d532b23c6c9..9a133c0da661 100644
> --- a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
> +++ b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml
> @@ -3,8 +3,8 @@
> become: yes
> command: /usr/bin/dnf config-manager --enable codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}-rpms
> when:
> - - vagrant_rhel_org_id is defined
> - - vagrant_rhel_activation_key is defined
> + - rhel_org_id is defined
> + - rhel_activation_key is defined
>
> - name: Install build dependencies for pynfs
> become: yes
> diff --git a/scripts/vagrant.Makefile b/scripts/vagrant.Makefile
> index 48d990321190..a6a74f8755e7 100644
> --- a/scripts/vagrant.Makefile
> +++ b/scripts/vagrant.Makefile
> @@ -56,12 +56,12 @@ ifeq (y,$(CONFIG_KDEVOPS_LIBVIRT_PCIE_PASSTHROUGH))
> LIBVIRT_PCIE_PASSTHROUGH := libvirt_pcie_passthrough_permissions
> endif
>
> -ifneq ($(strip $(CONFIG_VAGRANT_RHEL_ORG_ID)),)
> -ifneq ($(strip $(CONFIG_VAGRANT_RHEL_ACTIVATION_KEY)),)
> -RHEL_ORG_ID:=$(subst ",,$(CONFIG_VAGRANT_RHEL_ORG_ID))
> -RHEL_ACTIVATION_KEY:=$(subst ",,$(CONFIG_VAGRANT_RHEL_ACTIVATION_KEY))
> -VAGRANT_ARGS += vagrant_rhel_org_id="$(RHEL_ORG_ID)"
> -VAGRANT_ARGS += vagrant_rhel_activation_key="$(RHEL_ACTIVATION_KEY)"
> +ifneq ($(strip $(CONFIG_RHEL_ORG_ID_ORG_ID)),)
I think my search and replace went awry here. I've fixed up the names in
tree and can re-post if people want. This patch obviously needs more
testing, but my usual test rig for RHEL guests is down at the moment.
> +ifneq ($(strip $(CONFIG_RHEL_ORG_ID_ACTIVATION_KEY)),)
> +RHEL_ORG_ID:=$(subst ",,$(CONFIG_RHEL_ORG_ID_ORG_ID))
> +RHEL_ACTIVATION_KEY:=$(subst ",,$(CONFIG_RHEL_ORG_ID_ACTIVATION_KEY))
> +VAGRANT_ARGS += rhel_org_id="$(RHEL_ORG_ID)"
> +VAGRANT_ARGS += rhel_activation_key="$(RHEL_ACTIVATION_KEY)"
> endif
> endif
>
> diff --git a/vagrant/Kconfig.fedora b/vagrant/Kconfig.fedora
> index cd5fa5059246..aee5c17f2b3c 100644
> --- a/vagrant/Kconfig.fedora
> +++ b/vagrant/Kconfig.fedora
> @@ -17,7 +17,7 @@ config VAGRANT_FEDORA_OLD_RELEASE
> features. Enabling this will disable testing certain
> configurations by default in the fstests workflow.
>
> -config VAGRANT_RHEL_REGISTER
> +config RHEL_ORG_ID_REGISTER
> bool "Register the guests with Red Hat?"
> default n
> help
> @@ -25,16 +25,16 @@ config VAGRANT_RHEL_REGISTER
> packages from their core repos. Enable this if you're deploying an official
> RHEL cloud image (e.g. generic/rhel9).
>
> -config VAGRANT_RHEL_ORG_ID
> +config RHEL_ORG_ID_ORG_ID
> string "Red Hat Organization Identifier"
> - depends on VAGRANT_RHEL_REGISTER
> + depends on RHEL_ORG_ID_REGISTER
> default ""
> help
> Enter the Red Hat Organizational ID for your subscription here.
>
> -config VAGRANT_RHEL_ACTIVATION_KEY
> +config RHEL_ORG_ID_ACTIVATION_KEY
> string "Red Hat Activation Key"
> - depends on VAGRANT_RHEL_REGISTER
> + depends on RHEL_ORG_ID_REGISTER
> default ""
> help
> Enter the Activation Key to use when registering systems.
>
--
Jeff Layton <jlayton@kernel.org>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/
2023-12-08 15:01 ` [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/ Jeff Layton
@ 2023-12-09 2:05 ` Luis Chamberlain
2023-12-09 2:06 ` Luis Chamberlain
2023-12-09 12:07 ` Jeff Layton
0 siblings, 2 replies; 12+ messages in thread
From: Luis Chamberlain @ 2023-12-09 2:05 UTC (permalink / raw)
To: Jeff Layton; +Cc: kdevops
On Fri, Dec 08, 2023 at 10:01:32AM -0500, Jeff Layton wrote:
> diff --git a/scripts/bringup_vagrant.sh b/scripts/bringup_vagrant.sh
> index ad19d2980e4e..0ebcd4b3f4ba 100755
> --- a/scripts/bringup_vagrant.sh
> +++ b/scripts/bringup_vagrant.sh
> @@ -23,10 +23,10 @@ get_canonical_version()
> _vagrant_lacks_parallel()
> {
> PARALLEL_MISSING="0.7.0"
> - VAGRANT_LIBVIRT_VERSION="$(vagrant plugin list | sed -e 's|(| |g' | sed -e 's|,| |g' | awk '{print $2}')"
> + LIBVIRT_VERSION="$(vagrant plugin list | sed -e 's|(| |g' | sed -e 's|,| |g' | awk '{print $2}')"
This is a check which runs a vagrant command to check the plugin version
for libvirt and so I think it is properly named already there.
> OLD=$(get_canonical_version $PARALLEL_MISSING)
> - CURRENT=$(get_canonical_version $VAGRANT_LIBVIRT_VERSION)
> + CURRENT=$(get_canonical_version $LIBVIRT_VERSION)
> if [[ "$CURRENT" -le "$OLD" ]]; then
> return 1
> fi
So these first two hunks can be reverted.
> @@ -57,7 +57,7 @@ vagrant_check_dups()
>
> kdevops_pool_path="$CONFIG_KDEVOPS_STORAGE_POOL_PATH"
> # For libvirt we can do one more global sanity check
> - if [[ "$CONFIG_VAGRANT_LIBVIRT" == "y" ]]; then
> + if [[ "$CONFIG_LIBVIRT" == "y" ]]; then
> possible_image="${kdevops_pool_path}/vagrant_${instance}.img"
> if [[ -f $possible_image ]]; then
> echo "Image for instance $instance already exists ($possible_image), skippin bringup wipe of spare drives ..."
This one is using the config stuff so the rename is good.
> diff --git a/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515 b/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515
> diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config
> diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config
> diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config
> diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config
<-- etc -->
I don't think we should have to change these for two reasons:
* they are present to allow folks to reproduce, folks who want to
reproduce can look a the top of the file and git reset kdevops to
the version specified.
* It would incur a huge burdon on us to do this every time we want to
do a new rename
The rest looks good to me!
Luis
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/
2023-12-09 2:05 ` Luis Chamberlain
@ 2023-12-09 2:06 ` Luis Chamberlain
2023-12-09 2:08 ` Luis Chamberlain
2023-12-09 12:07 ` Jeff Layton
1 sibling, 1 reply; 12+ messages in thread
From: Luis Chamberlain @ 2023-12-09 2:06 UTC (permalink / raw)
To: Jeff Layton; +Cc: kdevops
OK now that I've reviewed the entire patch series I think what is
missing after this patch, to make things clean is to move all the
libvirt stuff into its own file, and then leaving in the vagrant
makefile only things related to vagrant.
Luis
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/
2023-12-09 2:06 ` Luis Chamberlain
@ 2023-12-09 2:08 ` Luis Chamberlain
0 siblings, 0 replies; 12+ messages in thread
From: Luis Chamberlain @ 2023-12-09 2:08 UTC (permalink / raw)
To: Jeff Layton; +Cc: kdevops
On Fri, Dec 08, 2023 at 06:06:55PM -0800, Luis Chamberlain wrote:
> OK now that I've reviewed the entire patch series I think what is
> missing after this patch, to make things clean is to move all the
> libvirt stuff into its own file, and then leaving in the vagrant
> makefile only things related to vagrant.
Sorry I meant that leaving in the vagrant kconfig file only things
relating to vagrant. This way vagrant libvirt plugin stuff selects
libvirt. And so does libguest.
Luis
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH kdevops v2 4/4] guestfs: add a new local guest management variant
2023-12-08 15:01 ` [PATCH kdevops v2 4/4] guestfs: add a new local guest management variant Jeff Layton
@ 2023-12-09 2:14 ` Luis Chamberlain
2023-12-09 12:25 ` Jeff Layton
0 siblings, 1 reply; 12+ messages in thread
From: Luis Chamberlain @ 2023-12-09 2:14 UTC (permalink / raw)
To: Jeff Layton; +Cc: kdevops
On Fri, Dec 08, 2023 at 10:01:35AM -0500, Jeff Layton wrote:
> diff --git a/vagrant/Kconfig b/vagrant/Kconfig
> index 3b069d098500..04c8556a5bff 100644
> --- a/vagrant/Kconfig
> +++ b/vagrant/Kconfig
> @@ -1,10 +1,11 @@
> -if VAGRANT
> +if VAGRANT || GUESTFS
>
> +if ! GUESTFS
> choice
> prompt "Vagrant virtualization technology to use"
> - default LIBVIRT
> + default VAGRANT_LIBVIRT_SELECT
You see, in kconfigs/Kconfig.bringup we'd have:
if LIBVIRT
source "kconfigs/Kconfig.libvirt"
endif
And before this the user can select varant or libguest. If the user
selects vagrant and if they choose vagrant-libvirt pluging then it
selects libvirt. Likewise if they enable libguest it enables libvirt.
Thoughts?
Otherwise this looks great!
Luis
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/
2023-12-09 2:05 ` Luis Chamberlain
2023-12-09 2:06 ` Luis Chamberlain
@ 2023-12-09 12:07 ` Jeff Layton
1 sibling, 0 replies; 12+ messages in thread
From: Jeff Layton @ 2023-12-09 12:07 UTC (permalink / raw)
To: Luis Chamberlain; +Cc: kdevops
On Fri, 2023-12-08 at 18:05 -0800, Luis Chamberlain wrote:
> On Fri, Dec 08, 2023 at 10:01:32AM -0500, Jeff Layton wrote:
> > diff --git a/scripts/bringup_vagrant.sh b/scripts/bringup_vagrant.sh
> > index ad19d2980e4e..0ebcd4b3f4ba 100755
> > --- a/scripts/bringup_vagrant.sh
> > +++ b/scripts/bringup_vagrant.sh
> > @@ -23,10 +23,10 @@ get_canonical_version()
> > _vagrant_lacks_parallel()
> > {
> > PARALLEL_MISSING="0.7.0"
> > - VAGRANT_LIBVIRT_VERSION="$(vagrant plugin list | sed -e 's|(| |g' | sed -e 's|,| |g' | awk '{print $2}')"
> > + LIBVIRT_VERSION="$(vagrant plugin list | sed -e 's|(| |g' | sed -e 's|,| |g' | awk '{print $2}')"
>
> This is a check which runs a vagrant command to check the plugin version
> for libvirt and so I think it is properly named already there.
>
> > OLD=$(get_canonical_version $PARALLEL_MISSING)
> > - CURRENT=$(get_canonical_version $VAGRANT_LIBVIRT_VERSION)
> > + CURRENT=$(get_canonical_version $LIBVIRT_VERSION)
> > if [[ "$CURRENT" -le "$OLD" ]]; then
> > return 1
> > fi
>
> So these first two hunks can be reverted.
>
Doh! Makes sense. I'll drop those hunks.
> > @@ -57,7 +57,7 @@ vagrant_check_dups()
> >
> > kdevops_pool_path="$CONFIG_KDEVOPS_STORAGE_POOL_PATH"
> > # For libvirt we can do one more global sanity check
> > - if [[ "$CONFIG_VAGRANT_LIBVIRT" == "y" ]]; then
> > + if [[ "$CONFIG_LIBVIRT" == "y" ]]; then
> > possible_image="${kdevops_pool_path}/vagrant_${instance}.img"
> > if [[ -f $possible_image ]]; then
> > echo "Image for instance $instance already exists ($possible_image), skippin bringup wipe of spare drives ..."
>
> This one is using the config stuff so the rename is good.
>
> > diff --git a/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515 b/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515
> > diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003-huge/kdevops.config
> > diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops-dagmcr-lbs-shmem-write-v6.6-rc4.config
> > diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231003/kdevops.config
> > diff --git a/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config b/workflows/fstests/results/archive/dagomez/tmpfs/libvirt-qemu/20231004/kdevops.config
>
> <-- etc -->
>
> I don't think we should have to change these for two reasons:
>
> * they are present to allow folks to reproduce, folks who want to
> reproduce can look a the top of the file and git reset kdevops to
> the version specified.
> * It would incur a huge burdon on us to do this every time we want to
> do a new rename
>
Got it. Ok, I'll drop those hunks too.
Thanks,
--
Jeff Layton <jlayton@kernel.org>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH kdevops v2 4/4] guestfs: add a new local guest management variant
2023-12-09 2:14 ` Luis Chamberlain
@ 2023-12-09 12:25 ` Jeff Layton
0 siblings, 0 replies; 12+ messages in thread
From: Jeff Layton @ 2023-12-09 12:25 UTC (permalink / raw)
To: Luis Chamberlain; +Cc: kdevops
On Fri, 2023-12-08 at 18:14 -0800, Luis Chamberlain wrote:
> On Fri, Dec 08, 2023 at 10:01:35AM -0500, Jeff Layton wrote:
> > diff --git a/vagrant/Kconfig b/vagrant/Kconfig
> > index 3b069d098500..04c8556a5bff 100644
> > --- a/vagrant/Kconfig
> > +++ b/vagrant/Kconfig
> > @@ -1,10 +1,11 @@
> > -if VAGRANT
> > +if VAGRANT || GUESTFS
> >
> > +if ! GUESTFS
> > choice
> > prompt "Vagrant virtualization technology to use"
> > - default LIBVIRT
> > + default VAGRANT_LIBVIRT_SELECT
>
> You see, in kconfigs/Kconfig.bringup we'd have:
>
> if LIBVIRT
> source "kconfigs/Kconfig.libvirt"
> endif
>
> And before this the user can select varant or libguest. If the user
> selects vagrant and if they choose vagrant-libvirt pluging then it
> selects libvirt. Likewise if they enable libguest it enables libvirt.
>
> Thoughts?
>
Got it. That makes a lot of sense. Let me see what I can do. I also
noticed that we probably need to rename the cpu count and memory
settings too. I'll see what I can come up with and will post a v3.
Thanks for the review!
--
Jeff Layton <jlayton@kernel.org>
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-12-09 12:25 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-08 15:01 [PATCH kdevops v2 0/4] guestfs: replacement for vagrant in kdevops Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 1/4] Kconfig: s/VAGRANT_LIBVIRT/LIBVIRT/ Jeff Layton
2023-12-09 2:05 ` Luis Chamberlain
2023-12-09 2:06 ` Luis Chamberlain
2023-12-09 2:08 ` Luis Chamberlain
2023-12-09 12:07 ` Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 2/4] nfsd: key off of LIBVIRT instead of VAGRANT for storage config Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 3/4] vagrant: rename the RHEL registration settings Jeff Layton
2023-12-08 15:23 ` Jeff Layton
2023-12-08 15:01 ` [PATCH kdevops v2 4/4] guestfs: add a new local guest management variant Jeff Layton
2023-12-09 2:14 ` Luis Chamberlain
2023-12-09 12:25 ` Jeff Layton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox