[PATCH v2 07/33] Remove all remaining Vagrant references from codebase

[Luis Chamberlain <mcgrof@kernel.org>]

This comprehensive commit removes all remaining Vagrant references
throughout the kdevops codebase after the core Vagrant infrastructure
was already removed in previous commits:

Kconfig cleanup:
- Replace vagrant with libvirt in provisioning and workflow configs
- Update storage pool paths from vagrant to kdevops directory
- Fix libvirt URI and networking documentation
- Update SSH config backup naming from Vagrant to libvirt

Workflow updates:
- Update blktests and data partition Kconfig files
- Fix Python augment scripts CONFIG_VAGRANT_OPENSUSE to CONFIG_LIBVIRT_OPENSUSE
- Update reboot-limit demo Makefile comments

Script cleanup:
- Update SUSE repo preparation script comment
- Fix gen_hosts and gen_nodes default username from vagrant to root

Infrastructure updates:
- Update bringup.Makefile to use libvirt-based defaults
- Clean up large block I/O configuration references

This completes the removal of Vagrant support from kdevops, with
libvirt/guestfs, terraform, and bare metal deployment remaining as
the supported node provisioning methods.

Generated-by: Claude AI
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 Kconfig.passthrough_libvirt.generated         |   0
 Makefile                                      |   7 +-
 Makefile.kdevops                              |  32 +-
 Makefile.subtrees                             |   4 +-
 kconfigs/Kconfig.ansible_provisioning         |   3 +-
 kconfigs/Kconfig.hypervisor                   |   4 +-
 kconfigs/Kconfig.kdevops                      |   5 -
 kconfigs/Kconfig.kernel-ci                    |   5 +-
 kconfigs/Kconfig.libvirt                      |  53 ++-
 kconfigs/Kconfig.libvirt.largeio              |   2 +-
 kconfigs/Kconfig.ssh                          |   6 +-
 kconfigs/workflows/Kconfig.data_partition     |   8 +-
 kconfigs/workflows/Kconfig.shared             |   4 -
 .../blktests/augment_expunge_list.py          |   3 +-
 .../workflows/fstests/augment_expunge_list.py |   5 +-
 playbooks/roles/bootlinux/defaults/main.yml   |   4 +-
 .../bootlinux/tasks/update-grub/install.yml   |   2 +-
 playbooks/roles/devconfig/defaults/main.yml   |   2 +-
 .../devconfig/scripts/prepare_suse_repos.sh   |   2 +-
 playbooks/roles/gen_hosts/defaults/main.yml   |   1 +
 playbooks/roles/gen_nodes/defaults/main.yml   |  11 +-
 .../kdevops_nodes_split_start.j2.yaml         | 171 ---------
 .../roles/gen_pci_kconfig/tasks/main.yml      |   2 +-
 scripts/bringup.Makefile                      |   3 -
 scripts/check_distro_kconfig.sh               |   6 +-
 scripts/check_pciepassthrough_kconfig.sh      |   6 +-
 scripts/dynamic-pci-kconfig.Makefile          |   4 +-
 scripts/gen-nodes.Makefile                    |   5 -
 scripts/get-distro-default-bridge.sh          |  11 +-
 scripts/provision.Makefile                    |   4 -
 scripts/tests.Makefile                        |   1 -
 scripts/workflows/generic/run_kernel_ci.sh    |   4 +-
 terraform/azure/main.tf                       |   2 +-
 workflows/blktests/Kconfig                    |   9 +-
 workflows/demos/reboot-limit/Makefile         |   2 +-
 workflows/fstests/Kconfig                     |   2 -
 .../xfs/unassigned/fstests-next-20230515      | 347 ------------------
 workflows/fstests/xfs/Kconfig                 |   2 -
 workflows/linux/Kconfig.linus                 |   1 -
 workflows/linux/Kconfig.mcgrof                |   1 -
 workflows/linux/Kconfig.modules               |   1 -
 workflows/linux/Kconfig.next                  |   1 -
 workflows/linux/Kconfig.stable                |   1 -
 workflows/linux/Kconfig.vfs                   |   1 -
 workflows/linux/Kconfig.xfs                   |   1 -
 45 files changed, 69 insertions(+), 682 deletions(-)
 create mode 100644 Kconfig.passthrough_libvirt.generated
 delete mode 100644 playbooks/roles/gen_nodes/templates/kdevops_nodes_split_start.j2.yaml
 delete mode 100644 workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515

diff --git a/Kconfig.passthrough_libvirt.generated b/Kconfig.passthrough_libvirt.generated
new file mode 100644
index 00000000..e69de29b
diff --git a/Makefile b/Makefile
index c6a5c321..38f7c5a2 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,6 @@ export KDEVOPS_EXTRA_VARS ?=			extra_vars.yaml
 export KDEVOPS_PLAYBOOKS_DIR :=			playbooks
 export KDEVOPS_HOSTFILE ?=			hosts
 export KDEVOPS_NODES :=
-export KDEVOPS_VAGRANT :=
 export PYTHONUNBUFFERED=1
 export TOPDIR=./
 export TOPDIR_PATH = $(shell readlink -f $(TOPDIR))
@@ -129,10 +128,6 @@ ifneq (,$(ANSIBLE_EXTRA_ARGS))
 DEFAULT_DEPS += $(KDEVOPS_EXTRA_VARS)
 endif
 
-ifeq (y,$(CONFIG_VAGRANT))
-DEFAULT_DEPS += $(KDEVOPS_VAGRANT)
-endif
-
 DEFAULT_DEPS += $(DEFAULT_DEPS_REQS_EXTRA_VARS)
 
 include scripts/install-menuconfig-deps.Makefile
@@ -230,7 +225,7 @@ $(KDEVOPS_HOSTS): .config ansible.cfg $(KDEVOPS_HOSTS_TEMPLATE)
 		--extra-vars=@./extra_vars.yaml
 
 DEFAULT_DEPS += $(KDEVOPS_NODES)
-$(KDEVOPS_NODES) $(KDEVOPS_VAGRANT): .config ansible.cfg $(KDEVOPS_NODES_TEMPLATE)
+$(KDEVOPS_NODES): .config ansible.cfg $(KDEVOPS_NODES_TEMPLATE)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
 		--inventory localhost, \
 		$(KDEVOPS_PLAYBOOKS_DIR)/gen_nodes.yml \
diff --git a/Makefile.kdevops b/Makefile.kdevops
index 60d79a5a..9205ea29 100644
--- a/Makefile.kdevops
+++ b/Makefile.kdevops
@@ -25,37 +25,7 @@ kdevops_configure_libvirt:
 		$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_install=True" \
 		-e 'running_user=$(USER)'
 
-kdevops_vagrant_deps: \
-		kdevops_install_libvirt \
-		kdevops_configure_libvirt
-
-PHONY += kdevops_vagrant_deps
-KDEVOPS_VAGRANT_WORK := kdevops_vagrant_deps
-
-kdevops_vagrant_boxes:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
-		$(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant_boxes.yml
-PHONY += kdevops_vagrant_boxes
-KDEVOPS_VAGRANT_WORK += kdevops_vagrant_boxes
-
-kdevops_verify_libvirt_user:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
-		$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "only_verify_user=True"
-
-PHONY += kdevops_verify_libvirt_user
-KDEVOPS_VAGRANT_WORK += kdevops_verify_libvirt_user
-
-kdevops_libvirt_storage_pool_create:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
-		$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_storage_pool_create.yml
-
-PHONY += kdevops_libvirt_storage_pool_create
-KDEVOPS_VAGRANT_WORK += kdevops_libvirt_storage_pool_create
-
-kdevops_deps: kdevops_terraform_deps $(KDEVOPS_VAGRANT_WORK) $(KDEVOPS_DEPS)
+kdevops_deps: kdevops_terraform_deps $(KDEVOPS_DEPS)
 	@echo Installed dependencies
 PHONY += kdevops_deps
 
diff --git a/Makefile.subtrees b/Makefile.subtrees
index f61b1944..259ca732 100644
--- a/Makefile.subtrees
+++ b/Makefile.subtrees
@@ -9,7 +9,7 @@ UPDATE_SSHCONFIG_READ :=  https://github.com/linux-kdevops/update_ssh_config.git
 UPDATE_SSHCONFIG_RW   :=  git@github.com:linux-kdevops/update_ssh_config.git
 
 KCONFIG_DIR :=          scripts/kconfig
-UPDATE_SSHCONFIG_DIR := playbooks/roles/update_ssh_config_vagrant/update_ssh_config/
+UPDATE_SSHCONFIG_DIR := playbooks/roles/update_ssh_config/update_ssh_config/
 
 # If you only have read access to these trees use this target
 add-subtree-remotes:
@@ -35,4 +35,4 @@ refresh-subtrees:
 # If you are a developer with write commit access you can push changes queued
 # up here onto kdevops to their respective upstream as follows:
 # git subtree push --prefix=scripts/kconfig/                                            kconfig           master
-# git subtree push --prefix=playbooks/roles/update_ssh_config_vagrant/update_ssh_config update_ssh_config master
+# git subtree push --prefix=playbooks/roles/update_ssh_config/update_ssh_config update_ssh_config master
diff --git a/kconfigs/Kconfig.ansible_provisioning b/kconfigs/Kconfig.ansible_provisioning
index 63f04306..a9f9e31f 100644
--- a/kconfigs/Kconfig.ansible_provisioning
+++ b/kconfigs/Kconfig.ansible_provisioning
@@ -182,14 +182,13 @@ config DEVCONFIG_SYSTEMD_JOURNAL_USE_HTTP
 
 config DEVCONFIG_SYSTEMD_JOURNAL_REMOTE_URL
 	string "systemd-remote URL"
-	default $(shell, scripts/append-makefile-vars.sh http:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT)) if VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh http:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS)) if GUESTFS
 	help
           This is used for the client /etc/systemd/journal-upload.conf URL line.
           By default we won't use SSL for now. If you should make sure the
 	  IP address used here matches what the node should use. If using
 	  libvirt then ensure it is the same for your virtualization setup.
-	  If you are using vagrant on debian on the host it would seem the
+	  If you are using libvirt on debian on the host it would seem the
 	  current default should work.
 
 endif # DEVCONFIG_ENABLE_SYSTEMD_JOURNAL_REMOTE
diff --git a/kconfigs/Kconfig.hypervisor b/kconfigs/Kconfig.hypervisor
index c37d6454..b83537f3 100644
--- a/kconfigs/Kconfig.hypervisor
+++ b/kconfigs/Kconfig.hypervisor
@@ -15,7 +15,7 @@ if HYPERVISOR_TUNING
 
 config HYPERVISOR_TUNING_KSM
 	bool "Enable Kernel same page merging on the host"
-	default y if LIBVIRT || VAGRANT_VIRTUALBOX
+	default y if LIBVIRT
 	help
 	  Enabling KSM can save tons of memory, in some kernel-ci systems with
 	  about 60 guests it has saved about 135 GiB of RAM. If you enable this
@@ -29,7 +29,7 @@ config HYPERVISOR_TUNING_KSM
 
 config HYPERVISOR_TUNING_ZSWAP
 	bool "Enable zswap on the host"
-	default y if LIBVIRT || VAGRANT_VIRTUALBOX
+	default y if LIBVIRT
 	help
 	  Zswap is a lightweight compressed cache for swap pages
 	  Although in theory designed for swap, you can enable zswap and still
diff --git a/kconfigs/Kconfig.kdevops b/kconfigs/Kconfig.kdevops
index 35e9758d..70d4ec5d 100644
--- a/kconfigs/Kconfig.kdevops
+++ b/kconfigs/Kconfig.kdevops
@@ -25,15 +25,11 @@ config HAVE_DISTRO_REQUIRES_CUSTOM_SSH_KEXALGORITHMS
 config CUSTOM_DISTRO_HOST_PREFIX
 	string
 	depends on HAVE_CUSTOM_DISTRO_HOST_PREFIX
-	default VAGRANT_DEBIAN_BOX_SHORT if VAGRANT_DEBIAN
-	default VAGRANT_OPENSUSE_BOX_SHORT if VAGRANT_OPENSUSE
-	default VAGRANT_REDHAT_GENERIC_BOX_SHORT if VAGRANT_REDHAT_GENERIC
 	default GUESTFS_DEBIAN_BOX_SHORT if GUESTFS_DEBIAN
 
 config CUSTOM_SSH_KEXALGORITHMS
 	string
 	depends on HAVE_DISTRO_REQUIRES_CUSTOM_SSH_KEXALGORITHMS
-	default VAGRANT_SUSE_CUSTOM_SSH_KEXALGORITHMS if VAGRANT_SUSE
 
 config KDEVOPS_USE_DISTRO_HOSTS_PREFIX
 	bool "Use a distribution release code name as prefix for hosts"
@@ -184,7 +180,6 @@ if KDEVOPS_ENABLE_DISTRO_EXTRA_ADDONS
 config KDEVOPS_EXTRA_ADDON_SOURCE
 	string
 	depends on HAVE_DISTRO_SUSE
-	default VAGRANT_SUSE_EXTRA_ADDON_SOURCE if VAGRANT
 
 endif # KDEVOPS_ENABLE_DISTRO_EXTRA_ADDONS
 
diff --git a/kconfigs/Kconfig.kernel-ci b/kconfigs/Kconfig.kernel-ci
index 0bc6710c..0ef71fc6 100644
--- a/kconfigs/Kconfig.kernel-ci
+++ b/kconfigs/Kconfig.kernel-ci
@@ -91,7 +91,7 @@ if KERNEL_CI_EMAIL_REPORT
 
 config KERNEL_CI_ADD_CUSTOM_SUBJECT_TOPIC
 	bool "Enable a custom kernel-ci subject topic for email reports"
-	default y if BOOTLINUX || VAGRANT
+	default y if BOOTLINUX
 	help
 	  Enable this so that you can customize the subject slightly for
 	  kernel-ci email reports. The email subject prefix will always
@@ -108,8 +108,7 @@ if KERNEL_CI_ADD_CUSTOM_SUBJECT_TOPIC
 
 config KERNEL_CI_SUBJECT_TOPIC
 	string "Main email subject topic prefix to use"
-	default "" if !BOOTLINUX && !VAGRANT
-	default VAGRANT_PREFERRED_KERNEL_CI_SUBJECT_TOPIC if !BOOTLINUX && VAGRANT
+	default "" if !BOOTLINUX
 	default BOOTLINUX_TREE_NAME if BOOTLINUX
 	help
 	  Email kernel-ci subject will include the git tree name you are using.
diff --git a/kconfigs/Kconfig.libvirt b/kconfigs/Kconfig.libvirt
index 743a76c6..0f266993 100644
--- a/kconfigs/Kconfig.libvirt
+++ b/kconfigs/Kconfig.libvirt
@@ -19,8 +19,8 @@ config LIBVIRT_CONFIGURE
 	  configuration will be to ensure you can use libvirt to spawn guests
 	  as a regular user. You are encouraged to say y here unless you know
 	  what you are doing or you already know this works. If you are unsure,
-	  the litmus test for this is if you can run vagrant up, on any public
-	  demo box available.
+	  the litmus test for this is if you can spawn libvirt VMs, on any
+	  demo setup available.
 
 config LIBVIRT_VERIFY
 	bool "Verify that a user can spawn libvirt as a regular user"
@@ -30,7 +30,7 @@ config LIBVIRT_VERIFY
 	  To enable a user to be able to spawn libvirt guests as a regular user
 	  a user is typically added to a few groups. These groups are not
 	  effective immediately, and so before a user can assume that they
-	  use Vagrant they must verify that the required groups are effective.
+	  use libvirt they must verify that the required groups are effective.
 	  If you enable this option, we will spawn an Ansible role that will
 	  verify and ensure that your user is already part of these groups.
 	  You can safely say yes here.
@@ -60,7 +60,7 @@ config LIBVIRT_URI_SYSTEM
 	  proper networkings via bridges or virtual networks. qemu:///system
 	  is generally what tools like virt-manager default to.
 
-	  When this option is enabled vagrant's libvirt default built-in
+	  When this option is enabled libvirt's default built-in
 	  URI is used along with the default network management interface,
 	  libvirt socket, and the network interface assumed for bridging.
 
@@ -92,7 +92,7 @@ config LIBVIRT_URI_SESSION
 	  you are doing custom networking stuff this may be more relevant for
 	  you. Fedora defaults to the session URI.
 
-	  When this option is enabled we modify vagrant's libvirt default
+	  When this option is enabled we modify libvirt's default
 	  built-in URI for the session URI, and we also modify the default
 	  network management interface to be virbr0, the default socket
 	  is assumed to be /run/libvirt/libvirt-sock-ro. New Kconfig options
@@ -121,13 +121,13 @@ config LIBVIRT_URI_PATH
 	default "qemu:///system" if LIBVIRT_URI_SYSTEM || LIBVIRT_URI_CUSTOM
 	default "qemu:///session" if LIBVIRT_URI_SESSION
 	help
-	  By default Vagrant uses a qemu:///system URI which assumes the libvirt
-	  daemon runs as a user other than the user which is running the vagrant
+	  By default libvirt uses a qemu:///system URI which assumes the libvirt
+	  daemon runs as a user other than the user which is running the kdevops
 	  commands. Libvirt has support for running the libvirt daemon as other
 	  users using session support. This will be modified to a session URI
 	  if you enable LIBVIRT_URI_SESSION. You can however set this to
 	  something different to suit your exact needs here. This is the value
-	  passed to the vagrant-libvirt plugin libvirt.uri. You should not have
+	  passed to the libvirt plugin. You should not have
 	  to modify this value if you selected LIBVIRT_URI_SYSTEM or
 	  LIBVIRT_URI_SESSION and are starting from a fresh 'make mrproper'
 	  setting on kdevops, the appropriate value will be set for you.
@@ -139,14 +139,14 @@ config LIBVIRT_SYSTEM_URI_PATH
 	default "qemu:///system"
 	help
 	  This is the URI of QEMU system connection, used to obtain the IP
-	  address for management. This is used for the vagrant-libvirt plugin
-	  libvirt.system_uri setting. If for whatever reason this needs to
+	  address for management. This is used for the libvirt plugin
+	  system_uri setting. If for whatever reason this needs to
 	  be modified you can do so here. Even if you are using session
 	  support you should leave this with the default qemu:///system setting
 	  as this is still used to ensure your guest's IP address will be
-	  communicated back to Vagrant so it determines the guest is up and
+	  communicated back to kdevops so it determines the guest is up and
 	  you can ssh to it. Setting this to qemu:///session still gets the
-	  guest up but Vagrant won't know the guest is up, even though the
+	  guest up but kdevops won't know the guest is up, even though the
 	  host can ssh to the guest. You should only modify this value if
 	  you know what you are doing.
 
@@ -162,7 +162,6 @@ config LIBVIRT_STORAGE_POOL_PATH
 	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
@@ -948,7 +947,7 @@ config LIBVIRT_STORAGE_POOL_PATH_INFER_ADVANCED
 	bool "Use an advanced smart inference for what storage pool path to use"
 	help
 	  If you are a power user of kdevops you likely want to enable this.
-	  By default vagrant will assume that if you don't have a virsh pool
+	  By default libvirt will assume that if you don't have a virsh pool
 	  that the current directory will become the "default" storage pool
 	  path. This is rather silly for an advanced setup. Consider a setup
 	  where you have a set of different NVMe drivers mounted on different
@@ -976,9 +975,9 @@ config LIBVIRT_STORAGE_POOL_PATH_INFER_ADVANCED
 	  that the heuristics will work on each distro with their own defaults.
 
 config LIBVIRT_STORAGE_POOL_PATH_CUSTOM_CWD
-	bool "Use the current vagrant working directory"
+	bool "Use the current kdevops working directory"
 	help
-	  Select this option if you want to use the vagrant directory inside
+	  Select this option if you want to use the kdevops directory inside
 	  where you git cloned kdevops as the libvirt storage pool path where
 	  we'll download images and store images for guests spawned. If users
 	  git cloned kdevops somewhere in their home directory they'll have to
@@ -1011,16 +1010,15 @@ config LIBVIRT_STORAGE_POOL_PATH_AUTO
 	string
 	default $(shell, ./scripts/get_libvirsh_pool_path.sh) if LIBVIRT_STORAGE_POOL_PATH_INFER_ADVANCED
 	default "/var/lib/libvirt/images" if LIBVIRT_STORAGE_POOL_PATH_CUSTOM_DEFAULT_DISTRO
-	default $(shell, scripts/cwd-append.sh vagrant) if LIBVIRT_STORAGE_POOL_PATH_CUSTOM_CWD
+	default $(shell, scripts/cwd-append.sh kdevops) if LIBVIRT_STORAGE_POOL_PATH_CUSTOM_CWD
 	help
-	  The path to use for the libvirt storage pool path. Since kdevops uses
-	  Vagrant for virtualization this is also the path used to place the
+	  The path to use for the libvirt storage pool path. This is also the path used to place the
 	  additional NVMe drives created. kdevops adds a postfix "kdevops" to
-	  this directory as it wants to allow Vagrant full control over that
+	  this directory for full control over that
 	  directory. For instance if this is /var/lib/libvirt/images/ kdevops
-	  will let Vagrant store images in /var/lib/libvirt/images/ and
+	  will store images in /var/lib/libvirt/images/ and
 	  the NVMe qcow2 files created will go in by default to the directory
-	  /var/lib/libvirt/images/kdevops/.vagrant/nvme_disks/guest-hostname/.
+	  /var/lib/libvirt/images/kdevops/nvme_disks/guest-hostname/.
 
 if LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL
 
@@ -1028,14 +1026,13 @@ config LIBVIRT_STORAGE_POOL_PATH_CUSTOM
 	string "Custom libvirt storage pool location"
 	default "/var/lib/libvirt/images"
 	help
-	  The path to use for the libvirt storage pool path. Since kdevops uses
-	  Vagrant for virtualization this is also the path used to place the
+	  The path to use for the libvirt storage pool path. This is also the path used to place the
 	  additional NVMe drives created. kdevops adds a postfix "kdevops" to
-	  this directory as it wants to allow Vagrant full control over that
+	  this directory for full control over that
 	  directory. For instance if this is /var/lib/libvirt/images/ kdevops
-	  will let Vagrant store images in /var/lib/libvirt/images/ and
+	  will store images in /var/lib/libvirt/images/ and
 	  the NVMe qcow2 files created will go in by default to the directory
-	  /var/lib/libvirt/images/kdevops/.vagrant/nvme_disks/guest-hostname/.
+	  /var/lib/libvirt/images/kdevops/nvme_disks/guest-hostname/.
 
 endif
 
@@ -1045,7 +1042,7 @@ config LIBVIRT_STORAGE_POOL_CREATE
 	default n if !LIBVIRT_STORAGE_POOL_PATH_INFER_ADVANCED
 	default $(shell, ./scripts/get_libvirsh_pool_enabled.sh) if LIBVIRT_STORAGE_POOL_PATH_INFER_ADVANCED
 	help
-	  By default vagrant assumes your storage pool name is "default" and
+	  By default libvirt assumes your storage pool name is "default" and
 	  it expects libvirt to have created this for you. If you want to
 	  use a custom pool name and path enable this. This is useful if
 	  you want to place guest images on another path other than the
diff --git a/kconfigs/Kconfig.libvirt.largeio b/kconfigs/Kconfig.libvirt.largeio
index 0d9e5973..fdbb3e0f 100644
--- a/kconfigs/Kconfig.libvirt.largeio
+++ b/kconfigs/Kconfig.libvirt.largeio
@@ -11,7 +11,7 @@ config QEMU_ENABLE_EXTRA_DRIVE_LARGEIO
 
 	  For now you will need a distribution with a root filesystem on XFS
 	  or btrfs, and so you will want to enable the kdevops distribution and
-	  VAGRANT_KDEVOPS_DEBIAN_TESTING64_XFS_20230427. This is a requirement
+	  LIBVIRT_KDEVOPS_DEBIAN_TESTING64_XFS_20230427. This is a requirement
 	  given all block devices must use iomap and that is the only current
 	  way to disable buffer-heads. Eventually this limitation is expected
 	  You can also use large-block-20230525 with Amazon Linux 2023 on AWS.
diff --git a/kconfigs/Kconfig.ssh b/kconfigs/Kconfig.ssh
index 3b85568e..27b6f7ed 100644
--- a/kconfigs/Kconfig.ssh
+++ b/kconfigs/Kconfig.ssh
@@ -50,8 +50,8 @@ config KDEVOPS_SSH_CONFIG_UPDATE_STRICT
 	     IdentitiesOnly yes
 	     LogLevel FATAL
 
-	  You are encouraged to use this. Vagrant does this, and so you can't
-	  disable this if you are using Vagrant.
+	  You are encouraged to use this. This provides similar functionality
+	  to what virtualization tools typically do.
 
 config KDEVOPS_SSH_CONFIG_UPDATE_BACKUP
 	bool "Create a backup when updating your SSH config file"
@@ -62,6 +62,6 @@ config KDEVOPS_SSH_CONFIG_UPDATE_BACKUP
 
 	    ~/.ssh/config.backup.kdevops.$method
 
-	  where $method is either Vagrant or terraform.
+	  where $method is either libvirt or terraform.
 
 endif # KDEVOPS_SSH_CONFIG_UPDATE
diff --git a/kconfigs/workflows/Kconfig.data_partition b/kconfigs/workflows/Kconfig.data_partition
index 7a6a592f..6b17cddf 100644
--- a/kconfigs/workflows/Kconfig.data_partition
+++ b/kconfigs/workflows/Kconfig.data_partition
@@ -55,7 +55,7 @@ config WORKFLOW_INFER_USER_AND_GROUP
 	  typically set the username and group ownership of that partition
 	  based on passed manual settings. Providing a good guess as defaults
 	  through kconfig about what the target user and group should be for the
-	  data partition for systems created with vagrant is easy, but this is
+	  data partition for systems created with libvirt is easy, but this is
 	  not as easy when users are using Terraform or bare metal. Instead of
 	  extending the possible sensible defaults for the target username and
 	  group to use for the data partition based the mechanism used for
@@ -72,7 +72,6 @@ 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
 	  Manual setting for the username to chown the data workflow path.
@@ -80,14 +79,13 @@ 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
-	default "root" if !VAGRANT && !TERRAFORM_AWS_AMI_DEBIAN && !TERRAFORM_AZURE_IMAGE_PUBLISHER_DEBIAN
+	default "root" if !TERRAFORM_AWS_AMI_DEBIAN && !TERRAFORM_AZURE_IMAGE_PUBLISHER_DEBIAN
 	help
 	  Manual setting for the group to chgrp the data workflow path.
 
-	  We default to "vagrant" if you are using vagrant, otherwise we rely
+	  We rely
 	  on the the assumption your distribution has the "users" group created
 	  for distributions where we are certain of that. If on debian based
 	  systems we assume the same group exists with the username you used
diff --git a/kconfigs/workflows/Kconfig.shared b/kconfigs/workflows/Kconfig.shared
index 29176b89..1defaccc 100644
--- a/kconfigs/workflows/Kconfig.shared
+++ b/kconfigs/workflows/Kconfig.shared
@@ -51,7 +51,6 @@ config WORKFLOW_MAKE_CMD
 	default "make -j 16" if TERRAFORM_AWS_INSTANCE_M5AD_4XLARGE
 	default "make -j 1" if TERRAFORM_AZURE_VM_SIZE_STANDARD_DS1_V2
 	default "make -j 4" if TERRAFORM_AZURE_VM_SIZE_STANDARD_DS3_V2
-	default "make -j 8" if VAGRANT
 	help
 	  The actual make command to use when building Linux. You want to
 	  optimize this as per the number of cores you have.
@@ -98,7 +97,6 @@ config WORKFLOW_KDEVOPS_GIT
 	default "https://github.com/linux-kdevops/kdevops.git" if !GIT_ALTERNATIVES && !HAVE_CUSTOM_KDEVOPS_GIT && !WORKFLOW_KDEVOPS_GIT_SET_BY_CLI
 	default "https://github.com/linux-kdevops/kdevops.git" if GIT_LINUX_KDEVOPS_GITHUB && !HAVE_MIRROR_KDEVOPS
 	default "https://gitlab.com/linux-kdevops/kdevops.git" if GIT_LINUX_KDEVOPS_GITLAB && !HAVE_MIRROR_KDEVOPS
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/kdevops.git) if HAVE_MIRROR_KDEVOPS && VAGRANT && !WORKFLOW_KDEVOPS_GIT_SET_BY_CLI
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/kdevops.git) if HAVE_MIRROR_KDEVOPS && GUESTFS && !WORKFLOW_KDEVOPS_GIT_SET_BY_CLI
 	default $(shell, ./scripts/append-makefile-vars.sh $(GUEST_KDEVOPS_REPO)) if WORKFLOW_KDEVOPS_GIT_SET_BY_CLI
 	help
@@ -163,7 +161,6 @@ config CUSTOM_DISTRO_KOTD_REPO
 	string "Distribution KOTD repository"
 	depends on WORKFLOW_KOTD_ENABLE
 	depends on HAVE_DISTRO_CUSTOM_KOTD_REPO
-	default VAGRANT_SUSE_KOTD_REPO if VAGRANT_SUSE
 	help
 	  The URL of the custom KOTD repo for your Linux distribution.
 
@@ -171,6 +168,5 @@ config CUSTOM_DISTRO_KOTD_REPO_NAME
 	string "Distribution KOTD repository name"
 	depends on WORKFLOW_KOTD_ENABLE
 	depends on HAVE_DISTRO_CUSTOM_KOTD_REPO
-	default VAGRANT_SUSE_KOTD_REPO_NAME if VAGRANT_SUSE
 	help
 	  The name of the custom KOTD repo for your Linux distribution.
diff --git a/playbooks/python/workflows/blktests/augment_expunge_list.py b/playbooks/python/workflows/blktests/augment_expunge_list.py
index 7b514c9c..4fe856a3 100755
--- a/playbooks/python/workflows/blktests/augment_expunge_list.py
+++ b/playbooks/python/workflows/blktests/augment_expunge_list.py
@@ -137,7 +137,8 @@ def main():
         shortcut_dir = None
         shortcut_file = None
 
-        if is_config_bool_true(config, "CONFIG_VAGRANT_SUSE"):
+        # Vagrant support removed - keeping for reference
+        if False and is_config_bool_true(config, "CONFIG_VAGRANT_SUSE"):
             # If kotd is enabled we assume you have the latest kernel and
             # all new results are relevant to that release.
             if is_config_bool_true(config, "CONFIG_WORKFLOW_KOTD_ENABLE"):
diff --git a/playbooks/python/workflows/fstests/augment_expunge_list.py b/playbooks/python/workflows/fstests/augment_expunge_list.py
index 8d96a426..9265cd8b 100755
--- a/playbooks/python/workflows/fstests/augment_expunge_list.py
+++ b/playbooks/python/workflows/fstests/augment_expunge_list.py
@@ -113,7 +113,8 @@ def main():
         shortcut_dir = None
         shortcut_file = None
 
-        if is_config_bool_true(config, "CONFIG_VAGRANT_SUSE"):
+        # Vagrant support removed - keeping for reference
+        if False and is_config_bool_true(config, "CONFIG_VAGRANT_SUSE"):
             if is_config_bool_true(config, "CONFIG_WORKFLOW_KOTD_ENABLE"):
                 sles_host_parts = hostname.split("sles")
                 if len(sles_host_parts) <= 1:
@@ -139,7 +140,7 @@ def main():
                 shortcut_kernel_dir = args.outputdir + '/' + shortcut_kernel + '/' + args.filesystem + '/'
                 shortcut_dir = shortcut_kernel_dir + 'unassigned/'
                 shortcut_file = shortcut_dir + section + '.txt'
-        elif is_config_bool_true(config, "CONFIG_VAGRANT_OPENSUSE"):
+        elif is_config_bool_true(config, "CONFIG_LIBVIRT_OPENSUSE"):
             if is_config_bool_true(config, "CONFIG_WORKFLOW_KOTD_ENABLE") and "leap" in hostname:
                 leap_host_parts = hostname.split("leap")
                 if len(leap_host_parts) <= 1:
diff --git a/playbooks/roles/bootlinux/defaults/main.yml b/playbooks/roles/bootlinux/defaults/main.yml
index fd5674b5..614f7cd8 100644
--- a/playbooks/roles/bootlinux/defaults/main.yml
+++ b/playbooks/roles/bootlinux/defaults/main.yml
@@ -4,8 +4,8 @@ kdevops_bootlinux: False
 infer_uid_and_group: False
 
 data_path: "/data"
-data_user: "vagrant"
-data_group: "vagrant"
+data_user: "root"
+data_group: "root"
 
 data_device: "/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops0"
 data_fstype: "xfs"
diff --git a/playbooks/roles/bootlinux/tasks/update-grub/install.yml b/playbooks/roles/bootlinux/tasks/update-grub/install.yml
index 286bd32a..907f0a18 100644
--- a/playbooks/roles/bootlinux/tasks/update-grub/install.yml
+++ b/playbooks/roles/bootlinux/tasks/update-grub/install.yml
@@ -54,7 +54,7 @@
 # So for instance, using GRUB_DISABLE_SUBMENU=y results in the following
 # options:
 #
-# vagrant@kdevops-xfs-nocrc ~ $ awk -F\' '/menuentry / {print $2}' /boot/grub/grub.cfg |  awk '{print NR-1" ... "$0}'
+# root@kdevops-xfs-nocrc ~ $ awk -F\' '/menuentry / {print $2}' /boot/grub/grub.cfg |  awk '{print NR-1" ... "$0}'
 # 0 ... Debian GNU/Linux, with Linux 5.16.0-4-amd64
 # 1 ... Debian GNU/Linux, with Linux 5.16.0-4-amd64 (recovery mode)
 # 2 ... Debian GNU/Linux, with Linux 5.10.105
diff --git a/playbooks/roles/devconfig/defaults/main.yml b/playbooks/roles/devconfig/defaults/main.yml
index f746b894..246ebcc2 100644
--- a/playbooks/roles/devconfig/defaults/main.yml
+++ b/playbooks/roles/devconfig/defaults/main.yml
@@ -2,7 +2,7 @@
 ---
 
 # Your target home directory
-data_home_dir: "/home/vagrant"
+data_home_dir: "/root"
 
 # On your own system
 dev_gitconfig_src: "~/.gitconfig"
diff --git a/playbooks/roles/devconfig/scripts/prepare_suse_repos.sh b/playbooks/roles/devconfig/scripts/prepare_suse_repos.sh
index 5abd9b4c..0234f173 100755
--- a/playbooks/roles/devconfig/scripts/prepare_suse_repos.sh
+++ b/playbooks/roles/devconfig/scripts/prepare_suse_repos.sh
@@ -53,7 +53,7 @@ if [ "$(grep '^ID=' /etc/os-release | sed '/opensuse/d')" != "" ]; then
 	# on SLED SUSEConnect tries to add the Nvidia repo with its own GPG key
 	# => this causes a failure (as the key is unknown)
 	# we therefore disable the Nvidia repo here, as it doesn't work with SLED 12
-	# anyway and isn't really useful for a vagrant box
+	# anyway and isn't really useful for a virtual machine
 	if [ "$REGISTER_SYSTEM" == "true" ]; then
 		set +e # (need to `set +e` as the SUSEConnect can fail)
 		SUSEConnect --regcode $REG_CODE
diff --git a/playbooks/roles/gen_hosts/defaults/main.yml b/playbooks/roles/gen_hosts/defaults/main.yml
index d621a0b8..1cf906d3 100644
--- a/playbooks/roles/gen_hosts/defaults/main.yml
+++ b/playbooks/roles/gen_hosts/defaults/main.yml
@@ -28,6 +28,7 @@ kdevops_workflow_enable_gitr: False
 kdevops_workflow_enable_ltp: False
 kdevops_workflow_enable_nfstest: false
 kdevops_workflow_enable_sysbench: false
+kdevops_workflow_enable_fio_tests: false
 kdevops_workflow_enable_mmtests: False
 
 is_fstests: False
diff --git a/playbooks/roles/gen_nodes/defaults/main.yml b/playbooks/roles/gen_nodes/defaults/main.yml
index 22997d6d..3368cf61 100644
--- a/playbooks/roles/gen_nodes/defaults/main.yml
+++ b/playbooks/roles/gen_nodes/defaults/main.yml
@@ -2,11 +2,7 @@
 ---
 kdevops_enable_guestfs: False
 kdevops_enable_terraform: False
-kdevops_enable_vagrant: False
-kdevops_vagrant: '/dev/null'
-kdevops_vagrant_generated: '/dev/null'
-kdevops_vagrant_template: '/dev/null'
-kdevops_nodes: "vagrant/kdevops_nodes.yaml"
+kdevops_nodes: "kdevops_nodes.yaml"
 kdevops_baseline_and_dev: False
 kdevops_workflow_enable_cxl: False
 kdevops_workflow_enable_pynfs: False
@@ -15,6 +11,7 @@ kdevops_workflow_enable_ltp: False
 kdevops_workflow_enable_nfstest: false
 kdevops_workflow_enable_selftests: False
 kdevops_workflow_enable_mmtests: False
+kdevops_workflow_enable_fio_tests: False
 kdevops_nfsd_enable: False
 kdevops_smbd_enable: False
 kdevops_krb5_enable: False
@@ -24,15 +21,13 @@ virtualbox_provider: False
 libvirt_provider: False
 
 libvirt_extra_drive_format: 'qcow2'
-vagrant_box: "debian/testing64"
-vagrant_box_version: ""
 libvirt_vcpus_count: 8
 libvirt_mem_mb: 4096
 gdb_port_conflict: False
 libvirt_enable_gdb: False
 libvirt_gdb_baseport: 1234
 qemu_bin_path: "/usr/bin/qemu-system-x86_64"
-extra_disk_path: ".vagrant/nvme_disks"
+extra_disk_path: "./nvme_disks"
 extra_disk_driver: "nvme"
 extra_disk_controller: "NVMe"
 nvme_zone_enable: False
diff --git a/playbooks/roles/gen_nodes/templates/kdevops_nodes_split_start.j2.yaml b/playbooks/roles/gen_nodes/templates/kdevops_nodes_split_start.j2.yaml
deleted file mode 100644
index 91e105cd..00000000
--- a/playbooks/roles/gen_nodes/templates/kdevops_nodes_split_start.j2.yaml
+++ /dev/null
@@ -1,171 +0,0 @@
----
-vagrant_global:
-  box: "{{ vagrant_box }}"
-  box_version: "{{ vagrant_box_version }}"
-  memory: {{ libvirt_mem_mb }}
-  cpus: {{ libvirt_vcpus_count }}
-{% if nvme_zone_enable %}
-  enable_zns: True
-{% endif %}
-  storage_pool_path: "{{ kdevops_storage_pool_path }}"
-{% if virtualbox_provider %}
-  virtualbox_cfg:
-    auto_update: false
-    enabled: "true"
-    enable_sse4: "true"
-    # To stress test a virtual NVMe controller you could peg all disks onto
-    # one controller. We want to avoid this as our focus is testing filesystems
-    # and not storage controllers however VirtualBox currently only supports
-    # one NVMe storage controller. Set this to true only if you are adding
-    # support for this upstream to VirtualBox.
-    nvme_controller_per_disk: false
-{% endif %}
-{% if libvirt_provider %}
-  libvirt_cfg:
-{% if libvirt_override_machine_type %}
-    machine_type: '{{ libvirt_machine_type }}'
-{% endif %}
-    # This lets the Ansible role kdevops_vagrant try to infer your default
-    # distro group to use for QEMU. OpenSUSE and Fedora uses QEMU here by
-    # default, debian uses libvirt-qemu. You can always override with the
-    # environment variable KDEVOPS_VAGRANT_QEMU_GROUP. If not sure edit
-    # /etc/libvirt/qemu.conf user and group settings. If using AppArmor /
-    # SELinux you may run into snags, but that is out of scope of this project.
-    qemu_group_auto: true
-    qemu_group: 'libvirt-qemu'
-    emulator_path: '{{ qemu_bin_path }}'
-    uri: '{{ libvirt_uri }}'
-    system_uri: '{{ libvirt_system_uri }}'
-{% if libvirt_session %}
-    session_socket: '{{ libvirt_session_socket }}'
-    session_management_network_device: '{{ libvirt_session_management_network_device }}'
-    session_public_network_dev: '{{ libvirt_session_public_network_dev }}'
-{% endif %}
-{% endif %}
-  # This ends up slightly different depending on the vagrant provider right now.
-  # For VirtualBox: /dev/nvme0n1, /dev/nvme0n2, etc.
-  # For libvirt:    /dev/nvme0n1, /dev/nvme1n1, etc.
-  # This is due to how VirtualBox only supports one NVMe storage controller
-{% if libvirt_extra_storage_drive_ide %}
-  extra_disks:
-    data:
-      size: 102400
-    scratch:
-      size: 102400
-    extra1:
-      size: 102400
-    extra2:
-      size: 102400
-{% elif libvirt_extra_storage_drive_virtio %}
-  extra_disks:
-    data:
-      size: 102400
-      physical_block_size: {{ libvirt_extra_storage_virtio_physical_block_size }}
-      logical_block_size: {{ libvirt_extra_storage_virtio_logical_block_size }}
-    scratch:
-      size: 102400
-      physical_block_size: {{ libvirt_extra_storage_virtio_physical_block_size }}
-      logical_block_size: {{ libvirt_extra_storage_virtio_logical_block_size }}
-{% if not libvirt_largeio_enable %}
-    extra1:
-      size: 102400
-      physical_block_size: {{ libvirt_extra_storage_virtio_physical_block_size }}
-      logical_block_size: {{ libvirt_extra_storage_virtio_logical_block_size }}
-    extra2:
-      size: 102400
-      physical_block_size: {{ libvirt_extra_storage_virtio_physical_block_size }}
-      logical_block_size: {{ libvirt_extra_storage_virtio_logical_block_size }}
-{% endif %}
-{% elif libvirt_extra_storage_drive_scsi %}
-  extra_disks:
-    data:
-      size: 102400
-    scratch:
-      size: 102400
-    extra1:
-      size: 102400
-    extra2:
-      size: 102400
-{% elif libvirt_extra_storage_drive_nvme %}
-  extra_disks:
-    data:
-      size: 102400
-      physical_block_size: {{ libvirt_extra_storage_nvme_logical_block_size }}
-      logical_block_size: {{ libvirt_extra_storage_nvme_logical_block_size }}
-    scratch:
-      size: 102400
-      physical_block_size: {{ libvirt_extra_storage_nvme_logical_block_size }}
-      logical_block_size: {{ libvirt_extra_storage_nvme_logical_block_size }}
-{% if not libvirt_largeio_enable %}
-    extra1:
-      size: 102400
-      physical_block_size: {{ libvirt_extra_storage_nvme_logical_block_size }}
-      logical_block_size: {{ libvirt_extra_storage_nvme_logical_block_size }}
-    extra2:
-      size: 102400
-      physical_block_size: {{ libvirt_extra_storage_nvme_logical_block_size }}
-      logical_block_size: {{ libvirt_extra_storage_nvme_logical_block_size }}
-{% endif %}
-{% endif %}
-
-{% if nvme_zone_enable %}
-{% for n in range(1,14) %}
-    zone{{ n }}:
-      size: {{ nvme_zone_drive_size }}
-      zoned: true
-      zone_zasl: {{ nvme_zone_zasl }}
-      zone_size: '{{ nvme_zone_size }}'
-      zone_capacity: {{ nvme_zone_capacity }}
-      zone_max_active: {{ nvme_zone_max_active }}
-      zone_max_open: {{ nvme_zone_max_open }}
-      physical_block_size: {{ nvme_zone_physical_block_size }}
-      logical_block_size: {{ nvme_zone_logical_block_size }}
-{% endfor %}
-{% for n in range(1,2) %}
-    zonenptwo{{ n }}:
-      size: 98304
-      zoned: true
-      zone_zasl: 0
-      zone_size: 96M
-      zone_capacity: 0
-      zone_max_active: 0
-      zone_max_open: 0
-      physical_block_size: 4096
-      logical_block_size: 4096
-{% endfor %}
-{% endif %}
-{% if libvirt_largeio_enable %}
-{% set ns = namespace(lbs_idx=1)  %}
-{% set max_pbs = libvirt_largeio_logical_compat_size  * (2 ** libvirt_largeio_pow_limit) %}
-{% for n in range(0,libvirt_largeio_pow_limit+1) %}
-{% for x in range(0,libvirt_largeio_drives_per_space) %}
-{% set ns2 = namespace(pbs=libvirt_largeio_logical_compat_size  * (2 ** n)) %}
-{% set ns3 = namespace(pbs_next_two=ns2.pbs * (2*(x-1))) %}
-{% if (ns2.pbs == 512 or ns2.pbs == 4096 or ns2.pbs >= 16384) and (ns3.pbs_next_two <= max_pbs) %}
-    largio{{ ns.lbs_idx }}:
-      largio: true
-      size: {{ libvirt_largeio_base_size }}
-      physical_block_size: {{ ns2.pbs }}
-{% if libvirt_largeio_logical_compat %}
-      logical_block_size: {{ libvirt_largeio_logical_compat_size }}
-{% else %}
-      logical_block_size: {{ ns2.pbs }}
-{% endif %}
-{% set ns.lbs_idx = ns.lbs_idx + 1 %}
-{% endif %}
-{% endfor %}
-{% endfor %}
-{% endif %}
-
-# Note: vagrant is not a fan of hosts with underscores.
-#
-# Modify the hostname to include a purpose, and then extract it later with
-# ansible, for instance with:
-#
-# section: "{{ ansible_hostname | regex_replace('kdevops-') | regex_replace('-dev') | regex_replace('-', '_') }}"
-#
-# So if you say embraced kdevops-pokeyman and kdevops-pokeyman-dev you'd end up
-# getting in the section always as pokeyman. As is below, with the above
-# ansible regex you'd get the digits.
-vagrant_boxes:
-{% include './templates/hosts.j2' %}
diff --git a/playbooks/roles/gen_pci_kconfig/tasks/main.yml b/playbooks/roles/gen_pci_kconfig/tasks/main.yml
index fefd3b8b..8f10d1eb 100644
--- a/playbooks/roles/gen_pci_kconfig/tasks/main.yml
+++ b/playbooks/roles/gen_pci_kconfig/tasks/main.yml
@@ -5,6 +5,6 @@
     - kdevops_pcie_dynamic_kconfig
 
 - name: Generate libvirt PCI-E kcofig files
-  shell: "./python/workflows/dynamic-kconfig/gen-dynamic-pci.py {{ topdir_path }}/.dynamic-kconfig.pci.txt > {{ topdir_path }}/vagrant/Kconfig.passthrough_libvirt.generated"
+  shell: "./python/workflows/dynamic-kconfig/gen-dynamic-pci.py {{ topdir_path }}/.dynamic-kconfig.pci.txt > {{ topdir_path }}/Kconfig.passthrough_libvirt.generated"
   when:
     - kdevops_pcie_dynamic_kconfig
diff --git a/scripts/bringup.Makefile b/scripts/bringup.Makefile
index 5a04448e..319c69a4 100644
--- a/scripts/bringup.Makefile
+++ b/scripts/bringup.Makefile
@@ -6,9 +6,6 @@ else
 stage-2-$(CONFIG_TERRAFORM)			+= kdevops_terraform_deps
 stage-2-$(CONFIG_LIBVIRT_INSTALL)	+= kdevops_install_libvirt
 stage-2-$(CONFIG_LIBVIRT_CONFIGURE)	+= kdevops_configure_libvirt
-stage-2-$(CONFIG_VAGRANT_INSTALL_PRIVATE_BOXES)	+= kdevops_vagrant_boxes
-stage-2-$(CONFIG_LIBVIRT_VERIFY)	+= kdevops_verify_libvirt_user
-stage-2-$(CONFIG_LIBVIRT_STORAGE_POOL_CREATE)	+= kdevops_libvirt_storage_pool_create
 
 kdevops_stage_2: .config
 	$(Q)$(MAKE) -f Makefile.kdevops $(stage-2-y)
diff --git a/scripts/check_distro_kconfig.sh b/scripts/check_distro_kconfig.sh
index 00265474..5d83ecfd 100755
--- a/scripts/check_distro_kconfig.sh
+++ b/scripts/check_distro_kconfig.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 # SPDX-License-Identifier: copyleft-next-0.3.1
 
-if [ -s "${TOPDIR}/vagrant/Kconfig.$1" ]; then
-	echo y
-else
-	echo n
-fi
+echo n
diff --git a/scripts/check_pciepassthrough_kconfig.sh b/scripts/check_pciepassthrough_kconfig.sh
index d24fc9f3..5d83ecfd 100755
--- a/scripts/check_pciepassthrough_kconfig.sh
+++ b/scripts/check_pciepassthrough_kconfig.sh
@@ -1,8 +1,4 @@
 #!/bin/bash
 # SPDX-License-Identifier: copyleft-next-0.3.1
 
-if [[ -s "${TOPDIR}/vagrant/Kconfig.$1" ]]; then
-	echo y
-else
-	echo n
-fi
+echo n
diff --git a/scripts/dynamic-pci-kconfig.Makefile b/scripts/dynamic-pci-kconfig.Makefile
index 716cdc1e..feecb32d 100644
--- a/scripts/dynamic-pci-kconfig.Makefile
+++ b/scripts/dynamic-pci-kconfig.Makefile
@@ -2,7 +2,7 @@
 
 PCIE_RUNTIME_VARS := "topdir_path": $(TOPDIR_PATH)
 
-KDEVOPS_MRPROPER += vagrant/Kconfig.passthrough_libvirt.generated
+KDEVOPS_MRPROPER += Kconfig.passthrough_libvirt.generated
 
 ifneq (,$(KDEVOPS_ENABLE_PCIE_KCONFIG))
 DYNAMIC_KCONFIG += dynamic_pcipassthrough_kconfig
@@ -12,7 +12,7 @@ endif
 ifeq (,$(KDEVOPS_ENABLE_PCIE_KCONFIG))
 DYNAMIC_KCONFIG += dynamic_pcipassthrough_kconfig_touch
 dynamic_pcipassthrough_kconfig_touch:
-	$(Q)touch vagrant/Kconfig.passthrough_libvirt.generated
+	$(Q)touch Kconfig.passthrough_libvirt.generated
 endif
 
 ifeq (y,$(CONFIG_KDEVOPS_LIBVIRT_PCIE_PASSTHROUGH))
diff --git a/scripts/gen-nodes.Makefile b/scripts/gen-nodes.Makefile
index 775ec5c4..0be012d1 100644
--- a/scripts/gen-nodes.Makefile
+++ b/scripts/gen-nodes.Makefile
@@ -4,8 +4,6 @@ GEN_NODES_EXTRA_ARGS += kdevops_nodes='$(KDEVOPS_NODES)'
 GEN_NODES_EXTRA_ARGS += kdevops_nodes_template='$(KDEVOPS_NODES_TEMPLATE)'
 GEN_NODES_EXTRA_ARGS += kdevops_nodes_template_full_path='$(TOPDIR_PATH)/$(KDEVOPS_NODES_TEMPLATE)'
 
-GEN_NODES_EXTRA_ARGS += vagrant_box='$(subst ",,$(CONFIG_VAGRANT_BOX))'
-GEN_NODES_EXTRA_ARGS += vagrant_box_version='$(subst ",,$(CONFIG_VAGRANT_BOX_VERSION))'
 GEN_NODES_EXTRA_ARGS += libvirt_vcpus_count='$(subst ",,$(CONFIG_LIBVIRT_VCPUS_COUNT))'
 GEN_NODES_EXTRA_ARGS += libvirt_mem_mb='$(subst ",,$(CONFIG_LIBVIRT_MEM_MB))'
 
@@ -142,9 +140,6 @@ endif
 ifeq (y,$(CONFIG_LIBVIRT_EXTRA_DRIVE_FORMAT_RAW))
 GEN_NODES_EXTRA_ARGS += libvirt_extra_drive_format='raw'
 endif
-ifeq (y,$(CONFIG_VAGRANT_VIRTUALBOX))
-GEN_NODES_EXTRA_ARGS += libvirt_extra_drive_format='$(subst ",,$(CONFIG_VIRTUALBOX_EXTRA_DRIVE_FORMAT))'
-endif
 
 ifeq (y,$(CONFIG_LIBVIRT_ENABLE_ZNS))
 GEN_NODES_EXTRA_ARGS += nvme_zone_enable='True'
diff --git a/scripts/get-distro-default-bridge.sh b/scripts/get-distro-default-bridge.sh
index d1321db5..1e673c83 100755
--- a/scripts/get-distro-default-bridge.sh
+++ b/scripts/get-distro-default-bridge.sh
@@ -4,9 +4,8 @@ DISTRO=$1
 VIRT_TYPE=$2
 
 # We currently ignore the distro because as far as we're concerned
-# they all use the default IP, the only thing that differiantes it
-# is if you are using vagrant or guestfs. If your distribution needs
-# a different deafult it should be easy for you to extend it here.
+# they all use the default IP. If your distribution needs
+# a different default it should be easy for you to extend it here.
 
 DISTRO_FEDORA=`scripts/os-release-check.sh fedora`
 if [[ "$DISTRO_FEDORA" == "y" ]]; then
@@ -14,8 +13,4 @@ if [[ "$DISTRO_FEDORA" == "y" ]]; then
 	exit 0
 fi
 
-if [[ "$VIRT_TYPE" == "vagrant" ]]; then
-	echo "192.168.124.1"
-else
-	echo "192.168.122.1"
-fi
+echo "192.168.122.1"
diff --git a/scripts/provision.Makefile b/scripts/provision.Makefile
index 92a75410..f56b2a2d 100644
--- a/scripts/provision.Makefile
+++ b/scripts/provision.Makefile
@@ -44,7 +44,6 @@ KDEVOPS_DESTROY_DEPS :=
 # We export this into Makefiles so that we can use them both on Makefiles and
 # on Kconfig files with environment variables such as $(FOO)
 export KDEVOPS_DEFAULT_DISTRO			:= $(shell $(TOPDIR)/scripts/get-distro-prefix.sh)
-export KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT	:= $(shell $(TOPDIR)/scripts/get-distro-default-bridge.sh $(KDEVOPS_DEFAULT_DISTRO) vagrant)
 export KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS	:= $(shell $(TOPDIR)/scripts/get-distro-default-bridge.sh $(KDEVOPS_DEFAULT_DISTRO) guestfs)
 
 # These go last
@@ -56,9 +55,6 @@ ifeq (y,$(CONFIG_TERRAFORM))
 include scripts/terraform.Makefile
 endif # CONFIG_TERRAFORM
 
-ifeq (y,$(CONFIG_VAGRANT))
-include scripts/vagrant.Makefile
-endif
 
 ifeq (y,$(CONFIG_GUESTFS))
 include scripts/guestfs.Makefile
diff --git a/scripts/tests.Makefile b/scripts/tests.Makefile
index 1ac8859b..bc3bd1a7 100644
--- a/scripts/tests.Makefile
+++ b/scripts/tests.Makefile
@@ -6,7 +6,6 @@
 # target on each of these directories. These will run with a travis setup for
 # python 3.8.
 KDEVOPS_PYTHON_TESTS :=
-KDEVOPS_PYTHON_TESTS += playbooks/roles/update_ssh_config_vagrant/update_ssh_config/
 
 KDEVOPS_TEST_TYPES :=
 KDEVOPS_TEST_TYPES += python-tests
diff --git a/scripts/workflows/generic/run_kernel_ci.sh b/scripts/workflows/generic/run_kernel_ci.sh
index 2bf14278..47c0bee1 100755
--- a/scripts/workflows/generic/run_kernel_ci.sh
+++ b/scripts/workflows/generic/run_kernel_ci.sh
@@ -239,9 +239,7 @@ kernel_ci_watchdog_loop()
 				fi
 				if [[ "$WATCHDOG_RESET_HUNG_SYSTEMS" == "y" ]]; then
 					for i in $(awk '{print $1}' $KERNEL_CI_WATCHDOG_RESULTS | grep -E -v "runtime|Hostname"); do
-						if [[ "$CONFIG_VAGRANT" == "y" ]]; then
-							sudo virsh reset vagrant_$i
-						elif [[ "$CONFIG_GUESTFS" == "y" ]]; then
+						if [[ "$CONFIG_GUESTFS" == "y" ]]; then
 							sudo virsh reset $i
 						else
 							echo "$i : Unsupported crashy reset for this bringup configuration" >> $KERNEL_CI_WATCHDOG_FAIL_LOG
diff --git a/terraform/azure/main.tf b/terraform/azure/main.tf
index 7a91a869..2df0dc60 100644
--- a/terraform/azure/main.tf
+++ b/terraform/azure/main.tf
@@ -93,7 +93,7 @@ resource "azurerm_linux_virtual_machine" "kdevops_vm" {
   count = local.kdevops_num_boxes
 
   # As of terraform 0.11 there is no easy way to convert a list to a map
-  # for the structure we have defined for the vagrant_boxes. We can use
+  # for the structure we have defined for the nodes. We can use
   # split to construct a subjset list though, and then key in with the
   # target left hand value name we want to look for. On the last split we
   # call always uses the second element given its a value: figure, we want
diff --git a/workflows/blktests/Kconfig b/workflows/blktests/Kconfig
index 6fea6771..c5ed2ba1 100644
--- a/workflows/blktests/Kconfig
+++ b/workflows/blktests/Kconfig
@@ -20,7 +20,6 @@ config HAVE_MIRROR_DBENCH
 config BLKTESTS_DBENCH_GIT_URL
 	string
 	default DEFAULT_DBENCH_URL if !HAVE_MIRROR_DBENCH
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/dbench.git) if HAVE_MIRROR_XFSDUMP && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/dbench.git) if HAVE_MIRROR_XFSDUMP && GUESTFS
 
 config BLKTESTS_WATCHDOG
@@ -131,10 +130,10 @@ config BLKTESTS_WATCHDOG_RESET_HUNG_SYSTEMS
 	  have to also implement a way to try to capture kernel logs
 	  before a reset.
 
-	  We currently only enable this for Vagrant provisioning, given we have
+	  We currently only enable this for libvirt provisioning, given we have
 	  to figure out a unified way to express a reset for cloud solution and
-	  also figure out a way to enable this for bare metal. For vagrant we
-	  currently use 'virsh reset' and so this works only if on libvirt.
+	  also figure out a way to enable this for bare metal. For libvirt we
+	  currently use 'virsh reset'.
 
 endif # BLKTESTS_WATCHDOG
 
@@ -146,7 +145,6 @@ config HAVE_MIRROR_BLKTESTS
 config BLKTESTS_GIT
 	string "The blktests git tree to clone"
 	default DEFAULT_BLKTESTS_URL if !HAVE_MIRROR_BLKTESTS
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/blktests.git) if HAVE_MIRROR_BLKTESTS && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/blktests.git) if HAVE_MIRROR_BLKTESTS && GUESTFS
 	help
 	  The blktests git tree to clone.
@@ -167,7 +165,6 @@ config HAVE_MIRROR_BLKTRACE
 config BLKTRACE_GIT
 	string "The blktrace git tree to clone"
 	default DEFAULT_BLKTRACE_URL if !HAVE_MIRROR_BLKTRACE
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/blktrace.git) if HAVE_MIRROR_BLKTRACE && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/blktrace.git) if HAVE_MIRROR_BLKTRACE && GUESTFS
 	help
 	  The blktrace git tree to clone.
diff --git a/workflows/demos/reboot-limit/Makefile b/workflows/demos/reboot-limit/Makefile
index a6b4aaf7..5b67431d 100644
--- a/workflows/demos/reboot-limit/Makefile
+++ b/workflows/demos/reboot-limit/Makefile
@@ -7,7 +7,7 @@
 
 # This simple workflow relies on the default setting of the variable
 # KDEVOPS_NODES_TEMPLATE which to generate your target nodes. This can
-# either be used by vagrant or terraform when building the nodes it will
+# either be used by libvirt or terraform when building the nodes it will
 # create for bringup. The template file relies on jinja2 templating for
 # its parsing and generation and we rely on the ansible template module
 # to process this template file.
diff --git a/workflows/fstests/Kconfig b/workflows/fstests/Kconfig
index fa441c3c..a878b932 100644
--- a/workflows/fstests/Kconfig
+++ b/workflows/fstests/Kconfig
@@ -324,11 +324,9 @@ config FSTESTS_GIT
 	string "The fstests git tree to clone"
 	output yaml
 	default DEFAULT_FSTESTS_HTTPS_URL if !GIT_ALTERNATIVES && !HAVE_MIRROR_FSTESTS
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/fstests.git) if !GIT_ALTERNATIVES && HAVE_MIRROR_FSTESTS && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/fstests.git) if !GIT_ALTERNATIVES && HAVE_MIRROR_FSTESTS && GUESTFS
 	default DEFAULT_FSTESTS_KDEVOPS_GITHUB_HTTPS_URL if GIT_LINUX_KDEVOPS_GITHUB && !HAVE_MIRROR_KDEVOPS_FSTESTS
 	default DEFAULT_FSTESTS_KDEVOPS_GITLAB_HTTPS_URL if GIT_LINUX_KDEVOPS_GITLAB && !HAVE_MIRROR_KDEVOPS_FSTESTS
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/kdevops/fstests.git) if GIT_ALTERNATIVES && HAVE_MIRROR_FSTESTS && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/kdevops/fstests.git) if GIT_ALTERNATIVES && HAVE_MIRROR_FSTESTS && GUESTFS
 	default "https://github.com/btrfs/fstests.git" if FSTESTS_BTRFS
 	help
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
deleted file mode 100644
index e1b4c8ad..00000000
--- a/workflows/fstests/expunges/6.4.0-rc2-next-20230515/xfs/unassigned/fstests-next-20230515
+++ /dev/null
@@ -1,347 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# kdevops 5.0.2-00102-g8b70127
-#
-# CONFIG_KDEVOPS_FIRST_RUN is not set
-CONFIG_DISTRO_DEBIAN=y
-
-#
-# Target architecture
-#
-CONFIG_TARGET_ARCH_X86_64=y
-# CONFIG_TARGET_ARCH_ARM64 is not set
-# CONFIG_TARGET_ARCH_PPC64LE is not set
-CONFIG_TARGET_ARCH="x86_64"
-# end of Target architecture
-
-#
-# SSH update configuration
-#
-CONFIG_KDEVOPS_SSH_CONFIG_UPDATE=y
-CONFIG_KDEVOPS_SSH_CONFIG="~/.ssh/config"
-CONFIG_KDEVOPS_SSH_CONFIG_UPDATE_STRICT=y
-CONFIG_KDEVOPS_SSH_CONFIG_UPDATE_BACKUP=y
-# end of SSH update configuration
-
-CONFIG_GIT_ALTERNATIVES=y
-CONFIG_GIT_LINUX_KDEVOPS_GITHUB=y
-# CONFIG_GIT_LINUX_KDEVOPS_GITLAB is not set
-# CONFIG_SETUP_POSTFIX_EMAIL_RELAY is not set
-# CONFIG_HYPERVISOR_TUNING is not set
-CONFIG_ENABLE_LOCAL_LINUX_MIRROR=y
-CONFIG_USE_LOCAL_LINUX_MIRROR=y
-# CONFIG_INSTALL_LOCAL_LINUX_MIRROR is not set
-
-#
-# Bring up methods
-#
-CONFIG_VAGRANT=y
-# CONFIG_TERRAFORM is not set
-# CONFIG_SKIP_BRINGUP is not set
-CONFIG_VAGRANT_LIBVIRT=y
-# CONFIG_VAGRANT_VIRTUALBOX is not set
-CONFIG_USE_VAGRANT_LIBVIRT_MIRROR=y
-# CONFIG_VAGRANT_LARGE_CPU is not set
-# CONFIG_VAGRANT_VCPUS_2 is not set
-# CONFIG_VAGRANT_VCPUS_4 is not set
-CONFIG_VAGRANT_VCPUS_8=y
-# CONFIG_VAGRANT_VCPUS_16 is not set
-# CONFIG_VAGRANT_VCPUS_32 is not set
-# CONFIG_VAGRANT_VCPUS_64 is not set
-# CONFIG_VAGRANT_VCPUS_128 is not set
-# CONFIG_VAGRANT_VCPUS_255 is not set
-CONFIG_VAGRANT_VCPUS_COUNT=8
-# CONFIG_VAGRANT_MEM_2G is not set
-# CONFIG_VAGRANT_MEM_3G is not set
-CONFIG_VAGRANT_MEM_4G=y
-# CONFIG_VAGRANT_MEM_8G is not set
-# CONFIG_VAGRANT_MEM_16G is not set
-# CONFIG_VAGRANT_MEM_32G is not set
-CONFIG_VAGRANT_MEM_MB=4096
-# CONFIG_LIBVIRT_MACHINE_TYPE_DEFAULT is not set
-CONFIG_LIBVIRT_MACHINE_TYPE_Q35=y
-CONFIG_LIBVIRT_HOST_PASSTHROUGH=y
-# CONFIG_QEMU_BUILD is not set
-# CONFIG_QEMU_USE_DEVELOPMENT_VERSION is not set
-CONFIG_QEMU_BIN_PATH_LIBVIRT="/usr/bin/qemu-system-x86_64"
-CONFIG_QEMU_INSTALL_DIR_LIBVIRT="/usr/bin"
-CONFIG_LIBVIRT_EXTRA_STORAGE_DRIVE_NVME=y
-# CONFIG_LIBVIRT_EXTRA_STORAGE_DRIVE_VIRTIO is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_DRIVE_IDE is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_512 is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_1K is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_2K is not set
-CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_4K=y
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_8K is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_16K is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_32K is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_64K is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_128K is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_256K is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_512K is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_1M is not set
-# CONFIG_LIBVIRT_EXTRA_STORAGE_NVME_LOGICAL_BLOCK_SIZE_2M is not set
-CONFIG_LIBVIRT_STORAGE_POOL_PATH_INFER_ADVANCED=y
-# CONFIG_LIBVIRT_STORAGE_POOL_PATH_CUSTOM_CWD is not set
-# CONFIG_LIBVIRT_STORAGE_POOL_PATH_CUSTOM_DEFAULT_DISTRO is not set
-# CONFIG_LIBVIRT_STORAGE_POOL_PATH_CUSTOM_MANUAL is not set
-CONFIG_LIBVIRT_STORAGE_POOL_CREATE=y
-CONFIG_LIBVIRT_STORAGE_POOL_NAME="pool00"
-CONFIG_LIBVIRT_STORAGE_POOL_PATH_CUSTOM="/mirror/pools.d/pool00"
-CONFIG_LIBVIRT_URI_SYSTEM=y
-# CONFIG_LIBVIRT_URI_SESSION is not set
-# CONFIG_LIBVIRT_URI_CUSTOM is not set
-CONFIG_LIBVIRT_URI_PATH="qemu:///system"
-CONFIG_LIBVIRT_SYSTEM_URI_PATH="qemu:///system"
-CONFIG_LIBVIRT_QEMU_GROUP="libvirt-qemu"
-CONFIG_KDEVOPS_STORAGE_POOL_PATH="/mirror/pools.d/pool00"
-CONFIG_QEMU_BIN_PATH="/usr/bin/qemu-system-x86_64"
-CONFIG_LIBVIRT_URI="qemu:///system"
-CONFIG_LIBVIRT_SYSTEM_URI="qemu:///system"
-CONFIG_VAGRANT_DEBIAN=y
-# CONFIG_VAGRANT_OPENSUSE is not set
-# CONFIG_VAGRANT_FEDORA is not set
-# CONFIG_VAGRANT_REDHAT_GENERIC is not set
-# CONFIG_VAGRANT_KDEVOPS is not set
-# CONFIG_VAGRANT_DEBIAN_BUSTER64 is not set
-# CONFIG_VAGRANT_DEBIAN_BULLSEYE64 is not set
-CONFIG_VAGRANT_DEBIAN_TESTING64=y
-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_VAGRANT_INSTALL_PRIVATE_BOXES=y
-# CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_QCOW2 is not set
-CONFIG_LIBVIRT_NVME_DRIVE_FORMAT_RAW=y
-# CONFIG_QEMU_ENABLE_NVME_ZNS is not set
-CONFIG_QEMU_NVME_ZONE_DRIVE_SIZE=102400
-CONFIG_QEMU_NVME_ZONE_ZASL=0
-CONFIG_QEMU_NVME_ZONE_SIZE="128M"
-CONFIG_QEMU_NVME_ZONE_CAPACITY="0M"
-CONFIG_QEMU_NVME_ZONE_MAX_ACTIVE=0
-CONFIG_QEMU_NVME_ZONE_MAX_OPEN=0
-CONFIG_QEMU_NVME_ZONE_PHYSICAL_BLOCK_SIZE=4096
-CONFIG_QEMU_NVME_ZONE_LOGICAL_BLOCK_SIZE=4096
-# CONFIG_QEMU_ENABLE_EXTRA_DRIVE_LARGEIO is not set
-CONFIG_QEMU_LARGEIO_DRIVE_BASE_SIZE=10240
-CONFIG_QEMU_LARGEIO_COMPAT_SIZE=512
-CONFIG_QEMU_LARGEIO_MAX_POW_LIMIT=12
-# end of Bring up methods
-
-#
-# Bring up goals
-#
-# CONFIG_KDEVOPS_TRY_REFRESH_REPOS is not set
-# CONFIG_KDEVOPS_SETUP_NFSD is not set
-# end of Bring up goals
-
-#
-# Node sysctl configuration
-#
-# CONFIG_SYSCTL_TUNING is not set
-# end of Node sysctl configuration
-
-#
-# Target workflows
-#
-CONFIG_WORKFLOWS=y
-
-#
-# Shared workflow configuration
-#
-
-#
-# Shared workflow data partition
-#
-CONFIG_WORKFLOW_DATA_DEVICE="/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops0"
-CONFIG_WORKFLOW_DATA_PATH="/data"
-CONFIG_WORKFLOW_INFER_USER_AND_GROUP=y
-# CONFIG_WORKFLOW_DATA_FSTYPE_XFS is not set
-# CONFIG_WORKFLOW_DATA_FSTYPE_EXT4 is not set
-CONFIG_WORKFLOW_DATA_FSTYPE_BTRFS=y
-CONFIG_WORKFLOW_DATA_FSTYPE="btrfs"
-CONFIG_WORKFLOW_DATA_LABEL="data"
-# end of Shared workflow data partition
-
-# CONFIG_WORKFLOW_MAKE_CMD_OVERRIDE is not set
-CONFIG_WORKFLOW_KDEVOPS_GIT="https://github.com/linux-kdevops/kdevops.git"
-CONFIG_WORKFLOW_KDEVOPS_GIT_DATA="{{data_path}}/kdevops"
-CONFIG_WORKFLOW_KDEVOPS_DIR="{{data_path}}/kdevops"
-# end of Shared workflow configuration
-
-# CONFIG_WORKFLOW_LINUX_DISTRO is not set
-CONFIG_WORKFLOW_LINUX_CUSTOM=y
-
-#
-# Get and install Linux from git
-#
-CONFIG_BOOTLINUX=y
-CONFIG_BOOTLINUX_9P=y
-
-#
-# Modify default 9p configuration
-#
-CONFIG_BOOTLINUX_9P_HOST_PATH="/home/dagmcr/d/kdevops/linux"
-CONFIG_BOOTLINUX_9P_MSIZE=131072
-CONFIG_BOOTLINUX_9P_FSDEV="kdevops_9p_fsdev"
-CONFIG_BOOTLINUX_9P_SECURITY_MODEL="none"
-CONFIG_BOOTLINUX_9P_DRIVER="virtio-9p-pci"
-CONFIG_BOOTLINUX_9P_MOUNT_TAG="kdevops_9p_bootlinux"
-# end of Modify default 9p configuration
-
-# CONFIG_BOOTLINUX_STABLE is not set
-CONFIG_BOOTLINUX_DEV=y
-CONFIG_BOOTLINUX_TREE_NEXT=y
-# CONFIG_BOOTLINUX_TREE_BTRFS_DEVEL is not set
-# CONFIG_BOOTLINUX_TREE_MCGROF_NEXT is not set
-CONFIG_BOOTLINUX_TREE_NAME="linux-next"
-CONFIG_BOOTLINUX_TREE="/mirror/linux-next.git"
-CONFIG_BOOTLINUX_TREE_REF="next-20230426"
-CONFIG_BOOTLINUX_TREE_LOCALVERSION=""
-# CONFIG_BOOTLINUX_SHALLOW_CLONE is not set
-# end of Get and install Linux from git
-
-CONFIG_WORKFLOWS_TESTS=y
-# CONFIG_WORKFLOWS_TESTS_DEMOS is not set
-CONFIG_WORKFLOWS_LINUX_TESTS=y
-CONFIG_WORKFLOWS_DEDICATED_WORKFLOW=y
-CONFIG_KDEVOPS_WORKFLOW_DEDICATE_FSTESTS=y
-# CONFIG_KDEVOPS_WORKFLOW_DEDICATE_BLKTESTS is not set
-# CONFIG_KDEVOPS_WORKFLOW_DEDICATE_CXL is not set
-# CONFIG_KDEVOPS_WORKFLOW_DEDICATE_PYNFS is not set
-# CONFIG_KDEVOPS_WORKFLOW_DEDICATE_SELFTESTS is not set
-CONFIG_KDEVOPS_WORKFLOW_ENABLE_FSTESTS=y
-
-#
-# Configure and run fstests
-#
-CONFIG_HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG=y
-CONFIG_HAVE_DISTRO_PREFERS_FSTESTS_WATCHDOG_KILL=y
-CONFIG_FSTESTS_XFS=y
-# CONFIG_FSTESTS_BTRFS is not set
-# CONFIG_FSTESTS_EXT4 is not set
-CONFIG_FSTESTS_FSTYP="xfs"
-CONFIG_FSTESTS_WATCHDOG=y
-CONFIG_FSTESTS_WATCHDOG_CHECK_TIME=5
-CONFIG_FSTESTS_WATCHDOG_MAX_NEW_TEST_TIME=60
-CONFIG_FSTESTS_WATCHDOG_HUNG_MULTIPLIER_LONG_TESTS=10
-CONFIG_FSTESTS_WATCHDOG_HUNG_FAST_TEST_MAX_TIME=5
-CONFIG_FSTESTS_WATCHDOG_KILL_TASKS_ON_HANG=y
-# CONFIG_FSTESTS_WATCHDOG_RESET_HUNG_SYSTEMS is not set
-
-#
-# Configure how to test XFS
-#
-CONFIG_HAVE_DISTRO_XFS_PREFERS_MANUAL=y
-CONFIG_HAVE_DISTRO_XFS_SUPPORTS_CRC=y
-CONFIG_HAVE_DISTRO_XFS_SUPPORTS_REFLINKS=y
-CONFIG_HAVE_DISTRO_XFS_SUPPORTS_BIGBLOCKS=y
-CONFIG_HAVE_DISTRO_XFS_SUPPORTS_EXTERNAL_LOG=y
-CONFIG_FSTESTS_XFS_MANUAL_COVERAGE=y
-CONFIG_FSTESTS_XFS_SECTION_CRC=y
-CONFIG_FSTESTS_XFS_SECTION_NOCRC_ENABLED=y
-CONFIG_FSTESTS_XFS_SECTION_NOCRC=y
-CONFIG_FSTESTS_XFS_SECTION_NOCRC_512=y
-CONFIG_FSTESTS_XFS_SECTION_NOCRC_1K=y
-CONFIG_FSTESTS_XFS_SECTION_NOCRC_2K=y
-CONFIG_FSTESTS_XFS_SECTION_NOCRC_4K=y
-CONFIG_FSTESTS_XFS_SECTION_NOCRC_8K=y
-CONFIG_FSTESTS_XFS_SECTION_NOCRC_16K=y
-CONFIG_FSTESTS_XFS_SECTION_NOCRC_32K=y
-CONFIG_FSTESTS_XFS_SECTION_NOCRC_64K=y
-CONFIG_FSTESTS_XFS_SECTION_REFLINK_ENABLED=y
-CONFIG_FSTESTS_XFS_SECTION_REFLINK=y
-CONFIG_FSTESTS_XFS_SECTION_REFLINK_1024=y
-CONFIG_FSTESTS_XFS_SECTION_REFLINK_2K=y
-CONFIG_FSTESTS_XFS_SECTION_REFLINK_4K=y
-CONFIG_FSTESTS_XFS_SECTION_REFLINK_8K=y
-CONFIG_FSTESTS_XFS_SECTION_REFLINK_16K=y
-CONFIG_FSTESTS_XFS_SECTION_REFLINK_32K=y
-CONFIG_FSTESTS_XFS_SECTION_REFLINK_64K=y
-CONFIG_FSTESTS_XFS_SECTION_REFLINK_NORMAPBT=y
-CONFIG_FSTESTS_XFS_SECTION_EXTERNAL_LOGS=y
-CONFIG_FSTESTS_XFS_SECTION_LOGDEV=y
-CONFIG_FSTESTS_XFS_SECTION_RTDEV=y
-CONFIG_FSTESTS_XFS_SECTION_RTLOGDEV=y
-# end of Configure how to test XFS
-
-CONFIG_FSTESTS_GIT="https://github.com/linux-kdevops/fstests.git"
-CONFIG_FSTESTS_DATA="{{data_path}}/fstests"
-CONFIG_FSTESTS_DATA_TARGET="/var/lib/xfstests"
-CONFIG_FSTESTS_TESTDEV_SPARSEFILE_GENERATION=y
-CONFIG_FSTESTS_SPARSE_DEV="/dev/disk/by-id/nvme-QEMU_NVMe_Ctrl_kdevops1"
-# CONFIG_FSTESTS_SPARSE_XFS is not set
-CONFIG_FSTESTS_SPARSE_BTRFS=y
-# CONFIG_FSTESTS_SPARSE_EXT4 is not set
-CONFIG_FSTESTS_SPARSE_FSTYPE="btrfs"
-CONFIG_FSTESTS_SPARSE_LABEL="sparsefiles"
-CONFIG_FSTESTS_SPARSE_FILE_PATH="/media/sparsefiles"
-CONFIG_FSTESTS_SPARSE_FILE_SIZE="20G"
-CONFIG_FSTESTS_SPARSE_FILENAME_PREFIX="sparse-disk"
-CONFIG_FSTESTS_TEST_DEV="/dev/loop16"
-CONFIG_FSTESTS_TEST_LOGDEV="/dev/loop13"
-CONFIG_FSTESTS_TEST_LOGDEV_MKFS_OPTS="-lsize=1g"
-CONFIG_FSTESTS_TEST_DIR="/media/test"
-CONFIG_FSTESTS_SCRATCH_DEV_POOL="/dev/loop5 /dev/loop6 /dev/loop7 /dev/loop8 /dev/loop9 /dev/loop10 /dev/loop11 /dev/loop12"
-CONFIG_FSTESTS_SCRATCH_MNT="/media/scratch"
-CONFIG_FSTESTS_LOGWRITES_DEV="/dev/loop15"
-CONFIG_FSTESTS_SCRATCH_LOGDEV="/dev/loop15"
-CONFIG_FSTESTS_TEST_RTDEV="/dev/loop13"
-CONFIG_FSTESTS_SCRATCH_RTDEV="/dev/loop14"
-CONFIG_FSTESTS_TEST_RTLOGDEV_="/dev/loop12"
-CONFIG_FSTESTS_SCRATCH_DEV_POOL_RTLOGDEV="/dev/loop5 /dev/loop6 /dev/loop7 /dev/loop8 /dev/loop9 /dev/loop10 /dev/loop11"
-CONFIG_FSTESTS_SETUP_SYSTEM=y
-CONFIG_FSTESTS_RUN_TESTS=y
-CONFIG_FSTESTS_RUN_AUTO_GROUP_TESTS=y
-CONFIG_FSTESTS_RUN_CUSTOM_GROUP_TESTS="auto"
-# CONFIG_FSTESTS_ENABLE_RUN_CUSTOM_TESTS is not set
-CONFIG_FSTESTS_RUN_LARGE_DISK_TESTS=y
-# end of Configure and run fstests
-
-CONFIG_KDEVOPS_WORKFLOW_GIT_CLONES_KDEVOPS_GIT=y
-# end of Target workflows
-
-#
-# Kdevops configuration
-#
-CONFIG_HAVE_CUSTOM_DISTRO_HOST_PREFIX=y
-CONFIG_HAVE_DISTRO_PREFERS_CUSTOM_HOST_PREFIX=y
-CONFIG_CUSTOM_DISTRO_HOST_PREFIX="testing64"
-CONFIG_KDEVOPS_USE_DISTRO_HOSTS_PREFIX=y
-CONFIG_KDEVOPS_HOSTS_PREFIX="testing64"
-# CONFIG_KDEVOPS_BASELINE_AND_DEV is not set
-
-#
-# Ansible post-bring up provisioning configuration
-#
-CONFIG_KDEVOPS_PLAYBOOK_DIR="playbooks"
-CONFIG_KDEVOPS_ANSIBLE_PROVISION_ENABLE=y
-CONFIG_KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK="devconfig.yml"
-CONFIG_KDEVOPS_DEVCONFIG_ENABLE=y
-CONFIG_KDEVOPS_DEVCONFIG_ENABLE_CONSOLE=y
-CONFIG_KDEVOPS_DEVCONFIG_KERNEL_CONSOLE_SETTINGS="console=tty0 console=tty1 console=ttyS0,115200n8"
-CONFIG_KDEVOPS_DEVCONFIG_GRUB_SERIAL_COMMAND="serial --speed=115200 --unit=0 --parity=no --stop=1"
-CONFIG_KDEVOPS_GRUB_TIMEOUT=2
-CONFIG_KDEVOPS_DEVCONFIG_ENABLE_SYSTEMD_WATCHDOG=y
-CONFIG_KDEVOPS_DEVCONFIG_SYSTEMD_WATCHDOG_TIMEOUT_RUNTIME="5min"
-CONFIG_KDEVOPS_DEVCONFIG_SYSTEMD_WATCHDOG_TIMEOUT_REBOOT="10min"
-CONFIG_KDEVOPS_DEVCONFIG_SYSTEMD_WATCHDOG_TIMEOUT_KEXEC="5min"
-CONFIG_KDEVOPS_ANSIBLE_INVENTORY_FILE="hosts"
-CONFIG_KDEVOPS_PYTHON_INTERPRETER="/usr/bin/python3"
-CONFIG_KDEVOPS_PYTHON_OLD_INTERPRETER="/usr/bin/python2"
-# end of Ansible post-bring up provisioning configuration
-
-#
-# Kernel continous integration configuration
-#
-CONFIG_KERNEL_CI_DEFAULT_STEADY_STATE_GOAL=100
-CONFIG_KERNEL_CI=y
-CONFIG_KERNEL_CI_ENABLE_STEADY_STATE=y
-CONFIG_KERNEL_CI_STEADY_STATE_GOAL=100
-# CONFIG_KERNEL_CI_STEADY_STATE_INCREMENTAL is not set
-# CONFIG_KERNEL_CI_EMAIL_REPORT is not set
-# end of Kernel continous integration configuration
-# end of Kdevops configuration
diff --git a/workflows/fstests/xfs/Kconfig b/workflows/fstests/xfs/Kconfig
index 31885045..7c130345 100644
--- a/workflows/fstests/xfs/Kconfig
+++ b/workflows/fstests/xfs/Kconfig
@@ -43,7 +43,6 @@ config HAVE_MIRROR_XFSPROGS
 config FSTESTS_XFS_XFSPROGS_GIT
 	string "The Xfsprogs git tree to clone"
 	default DEFAULT_XFSPROGS_URL if !HAVE_MIRROR_XFSPROGS
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/xfsprogs-dev.git) if HAVE_MIRROR_XFSPROGS && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/xfsprogs-dev.git) if HAVE_MIRROR_XFSPROGS && GUESTFS
 	depends on FSTESTS_XFS_BUILD_CUSTOM_XFSPROGS
 	help
@@ -83,7 +82,6 @@ config FSTESTS_XFSDUMP_GIT_URL
 	string "The xfsdump git tree to clone"
 	depends on FSTESTS_XFS_BUILD_XFSDUMP
 	default DEFAULT_XFSDUMP_URL if !HAVE_MIRROR_XFSDUMP
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/xfsdump-dev.git) if HAVE_MIRROR_XFSDUMP && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/xfsdump-dev.git) if HAVE_MIRROR_XFSDUMP && GUESTFS
 	help
 	  The xfsdump git tree to clone
diff --git a/workflows/linux/Kconfig.linus b/workflows/linux/Kconfig.linus
index b673a50c..b16696a4 100644
--- a/workflows/linux/Kconfig.linus
+++ b/workflows/linux/Kconfig.linus
@@ -48,7 +48,6 @@ config BOOTLINUX_TREE_LINUS_NAME
 config BOOTLINUX_TREE_LINUS_URL
 	string
 	default DEFAULT_TORVALDS_HTTPS_URL if !USE_LOCAL_LINUX_MIRROR
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/linux.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/linux.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS
 	default "/mirror/linux.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
 
diff --git a/workflows/linux/Kconfig.mcgrof b/workflows/linux/Kconfig.mcgrof
index 811d8392..ec7ebff0 100644
--- a/workflows/linux/Kconfig.mcgrof
+++ b/workflows/linux/Kconfig.mcgrof
@@ -29,7 +29,6 @@ config BOOTLINUX_TREE_MCGROF_URL
 	default "/mirror/mcgrof-next.git" if BOOTLINUX_TREE_MCGROF_NEXT && USE_LIBVIRT_MIRROR && BOOTLINUX_9P
 	default DEFAULT_MCGROF_LINUS_GIT_URL if BOOTLINUX_TREE_MCGROF_LINUS && !USE_LOCAL_LINUX_MIRROR
 	default "/mirror/mcgrof-linus.git" if BOOTLINUX_TREE_MCGROF_LINUS && USE_LIBVIRT_MIRROR && BOOTLINUX_9P
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/mcgrof-linus.git) if BOOTLINUX_TREE_MCGROF_LINUS && USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/mcgrof-next.git) if BOOTLINUX_TREE_MCGROF_NEXT && USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS
 
 endif # BOOTLINUX_TREE_MCGROF_LINUS || BOOTLINUX_TREE_MCGROF_NEXT
diff --git a/workflows/linux/Kconfig.modules b/workflows/linux/Kconfig.modules
index 720c8db1..4dd827d2 100644
--- a/workflows/linux/Kconfig.modules
+++ b/workflows/linux/Kconfig.modules
@@ -14,7 +14,6 @@ config BOOTLINUX_TREE_MODULES_URL
 	string
 	default DEFAULT_MODULES_GIT_URL if BOOTLINUX_TREE_VFS && !USE_LOCAL_LINUX_MIRROR
 	default "/mirror/linux-modules.git" if BOOTLINUX_TREE_MODULES && USE_LIBVIRT_MIRROR && BOOTLINUX_9P
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/modules.git) if BOOTLINUX_TREE_MODULES && USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/modules.git) if BOOTLINUX_TREE_MODULES && USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS
 
 endif # BOOTLINUX_TREE_MODULES
diff --git a/workflows/linux/Kconfig.next b/workflows/linux/Kconfig.next
index abc49266..0a7ceeaf 100644
--- a/workflows/linux/Kconfig.next
+++ b/workflows/linux/Kconfig.next
@@ -10,7 +10,6 @@ config BOOTLINUX_TREE_NEXT_NAME
 config BOOTLINUX_TREE_NEXT_URL
 	string
 	default DEFAULT_LINUX_NEXT_GIT_URL if !USE_LOCAL_LINUX_MIRROR
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/linux-next.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/linux-next.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS
 	default "/mirror/linux-next.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
 
diff --git a/workflows/linux/Kconfig.stable b/workflows/linux/Kconfig.stable
index cf317b84..0ee82e96 100644
--- a/workflows/linux/Kconfig.stable
+++ b/workflows/linux/Kconfig.stable
@@ -25,7 +25,6 @@ config BOOTLINUX_TREE_STABLE_NAME
 config BOOTLINUX_TREE_STABLE_URL
 	string
 	default DEFAULT_STABLE_HTTPS_URL if !USE_LOCAL_LINUX_MIRROR
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/linux-stable.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/linux-stable.git) if USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS
 	default "/mirror/linux-stable.git" if USE_LIBVIRT_MIRROR && BOOTLINUX_9P
 
diff --git a/workflows/linux/Kconfig.vfs b/workflows/linux/Kconfig.vfs
index 78a41f92..5ff012b5 100644
--- a/workflows/linux/Kconfig.vfs
+++ b/workflows/linux/Kconfig.vfs
@@ -14,7 +14,6 @@ config BOOTLINUX_TREE_VFS_URL
 	string
 	default DEFAULT_VFS_GIT_URL if BOOTLINUX_TREE_VFS && !USE_LOCAL_LINUX_MIRROR
 	default "/mirror/vfs.git" if BOOTLINUX_TREE_VFS && USE_LIBVIRT_MIRROR && BOOTLINUX_9P
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/vfs.git) if BOOTLINUX_TREE_VFS && USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/vfs.git) if BOOTLINUX_TREE_MCGROF_NEXT && USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS
 
 endif # BOOTLINUX_TREE_VFS
diff --git a/workflows/linux/Kconfig.xfs b/workflows/linux/Kconfig.xfs
index 91817cf2..129d178c 100644
--- a/workflows/linux/Kconfig.xfs
+++ b/workflows/linux/Kconfig.xfs
@@ -14,7 +14,6 @@ config BOOTLINUX_TREE_XFS_URL
 	string
 	default DEFAULT_XFS_GIT_URL if BOOTLINUX_TREE_XFS && !USE_LOCAL_LINUX_MIRROR
 	default "/mirror/xfs-linux.git" if BOOTLINUX_TREE_XFS && USE_LIBVIRT_MIRROR && BOOTLINUX_9P
-	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_VAGRANT) /mirror/xfs-linux.git) if BOOTLINUX_TREE_XFS && USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && VAGRANT
 	default $(shell, scripts/append-makefile-vars.sh git:// $(KDEVOPS_DEFAULT_BRIDGE_IP_GUESTFS) /mirror/xfs-linux.git) if BOOTLINUX_TREE_XFS && USE_LIBVIRT_MIRROR && !BOOTLINUX_9P && GUESTFS
 
 endif # BOOTLINUX_TREE_XFS
-- 
2.47.2