Skip to content

Commit d761f7d

Browse files
committed
Remove obsolete vagrant support
1 parent 6e9c9df commit d761f7d

53 files changed

Lines changed: 141 additions & 2228 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ scripts/workflows/fstests/lib/__pycache__/
3131
scripts/workflows/blktests/lib/__pycache__/
3232
scripts/workflows/lib/__pycache__/
3333

34-
vagrant/kdevops_nodes.yaml
35-
vagrant/.Vagrantfile.generated
36-
vagrant/Vagrantfile
37-
.vagrant/
3834

3935
include/
4036

@@ -97,6 +93,6 @@ workflows/linux/refs/user
9793

9894
scripts/kconfig/.nconf-cfg
9995
.dynamic-kconfig.*
100-
vagrant/Kconfig.passthrough_libvirt.generated
96+
kconfigs/Kconfig.passthrough_libvirt.generated
10197

10298
archive/

Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ export KDEVOPS_EXTRA_VARS ?= extra_vars.yaml
1717
export KDEVOPS_PLAYBOOKS_DIR := playbooks
1818
export KDEVOPS_HOSTFILE ?= hosts
1919
export KDEVOPS_NODES :=
20-
export KDEVOPS_VAGRANT :=
2120
export PYTHONUNBUFFERED=1
2221
export TOPDIR=./
2322
export TOPDIR_PATH = $(shell readlink -f $(TOPDIR))
@@ -129,9 +128,6 @@ ifneq (,$(ANSIBLE_EXTRA_ARGS))
129128
DEFAULT_DEPS += $(KDEVOPS_EXTRA_VARS)
130129
endif
131130

132-
ifeq (y,$(CONFIG_VAGRANT))
133-
DEFAULT_DEPS += $(KDEVOPS_VAGRANT)
134-
endif
135131

136132
DEFAULT_DEPS += $(DEFAULT_DEPS_REQS_EXTRA_VARS)
137133

@@ -230,7 +226,7 @@ $(KDEVOPS_HOSTS): .config ansible.cfg $(KDEVOPS_HOSTS_TEMPLATE)
230226
--extra-vars=@./extra_vars.yaml
231227

232228
DEFAULT_DEPS += $(KDEVOPS_NODES)
233-
$(KDEVOPS_NODES) $(KDEVOPS_VAGRANT): .config ansible.cfg $(KDEVOPS_NODES_TEMPLATE)
229+
$(KDEVOPS_NODES): .config ansible.cfg $(KDEVOPS_NODES_TEMPLATE)
234230
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
235231
--inventory localhost, \
236232
$(KDEVOPS_PLAYBOOKS_DIR)/gen_nodes.yml \

Makefile.kdevops

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,21 @@ kdevops_configure_libvirt:
2525
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_install=True" \
2626
-e 'running_user=$(USER)'
2727

28-
kdevops_vagrant_deps: \
29-
kdevops_install_libvirt \
30-
kdevops_configure_libvirt
31-
32-
PHONY += kdevops_vagrant_deps
33-
KDEVOPS_VAGRANT_WORK := kdevops_vagrant_deps
34-
35-
kdevops_vagrant_boxes:
36-
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
37-
--inventory localhost, \
38-
$(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant_boxes.yml
39-
PHONY += kdevops_vagrant_boxes
40-
KDEVOPS_VAGRANT_WORK += kdevops_vagrant_boxes
4128

4229
kdevops_verify_libvirt_user:
4330
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
4431
--inventory localhost, \
4532
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "only_verify_user=True"
4633

4734
PHONY += kdevops_verify_libvirt_user
48-
KDEVOPS_VAGRANT_WORK += kdevops_verify_libvirt_user
4935

5036
kdevops_libvirt_storage_pool_create:
5137
$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
5238
--inventory localhost, \
5339
$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_storage_pool_create.yml
5440

5541
PHONY += kdevops_libvirt_storage_pool_create
56-
KDEVOPS_VAGRANT_WORK += kdevops_libvirt_storage_pool_create
5742

58-
kdevops_deps: kdevops_terraform_deps $(KDEVOPS_VAGRANT_WORK) $(KDEVOPS_DEPS)
5943
@echo Installed dependencies
6044
PHONY += kdevops_deps
6145

README.md

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@ an entire lab for Linux kernel testing for a complex subsystem in a jiffy.
4040

4141
It makes use of local ansible roles and optionally lets you use
4242
[libguestfs](https://libguestfs.org/) with libvirt or terraform in order
43-
to support an cloud provider. Support for vagrant in kdevops exists but is now
44-
deprecated in favor of [libguestfs](https://libguestfs.org/) since vagrant
45-
lacks any active maintenance, new development should use and focus on
46-
[libguestfs](https://libguestfs.org/).
43+
to support a cloud provider. Historical support for Vagrant has been
44+
removed in favor of [libguestfs](https://libguestfs.org/), which is
45+
actively maintained.
4746

4847
Variability is provided through the same variability language used in the Linux
4948
kernel, kconfig. It is written by Linux kernel developers, for Linux kernel
@@ -334,10 +333,8 @@ Below are sections which get into technical details of how kdevops works.
334333
* [How is extra_vars.yaml generated](docs/how-extra-vars-generated.md)
335334
* [How is the ansible hosts file generated](docs/the-gen-hosts-ansible-role.md)
336335
* [What are and how to generate the kdevops nodes files](docs/the-gen-nodes-ansible-role.md)
337-
* [How is the dynamic Vagrant files generated](docs/the-gen-nodes-ansible-role-vagrant.md)
338336
* [How is the terraform kdevops_nodes variable generated](docs/the-gen-nodes-ansible-role-terraform.md)
339337
* [How are the terraform terraform/terraform.tfvars variables generated](docs/the-terraform-gen-tfvar-ansible-role.md)
340-
* [Why Vagrant (deprecated) used to be used for virtualization](docs/why-vagrant.md)
341338
* [A case for supporting truncated files with loopback block devices](docs/testing-with-loopback.md)
342339
* [Seeing more issues with loopback / truncated files setup](docs/seeing-more-issues.md)
343340
* [Adding a new workflow to kdevops](docs/adding-a-new-workflow.md)
@@ -347,10 +344,8 @@ Below are sections which get into technical details of how kdevops works.
347344
* [Motivation behind kdevops](docs/motivations.md)
348345
* [Linux distribution support](docs/linux-distro-support.md)
349346
* [Overriding all Ansible role options with one file](docs/ansible-override.md)
350-
* [kdevops Vagrant support](docs/kdevops-vagrant.md)
351347
* [kdevops terraform support - cloud setup with kdevops](docs/kdevops-terraform.md)
352348
* [kdevops local Ansible roles](docs/ansible-roles.md)
353-
* [Tutorial on building your own custom Vagrant boxes](docs/custom-vagrant-boxes.md)
354349

355350
License
356351
-------

docs/ansible-roles.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@
22

33
The following local ansible roles are used:
44

5-
* [update_ssh_config_vagrant](./playbooks/roles/update_ssh_config_vagrant/README.md)
65
* [devconfig](./playbooks/roles/devconfig/README.md)
76
* [create_partition](./playbooks/roles/create_partition/README.md)
87
* create_data_partition: creates the data partition, uses the `create_partition` role
98
* [install_terraform/](./playbooks/roles/install_terraform/README.md)
10-
* [install_vagrant_boxes](./playbooks/roles/install_vagrant_boxes/README.md)
119
* [libvirt_user](./playbooks/roles/libvirt_user/README.md)
1210
* [update_ssh_config_vagrant](./playbooks/roles/update_ssh_config_vagrant/README.md)
1311

0 commit comments

Comments
 (0)