Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ scripts/workflows/fstests/lib/__pycache__/
scripts/workflows/blktests/lib/__pycache__/
scripts/workflows/lib/__pycache__/

vagrant/kdevops_nodes.yaml
vagrant/.Vagrantfile.generated
vagrant/Vagrantfile
.vagrant/

include/

Expand Down Expand Up @@ -97,6 +93,6 @@ workflows/linux/refs/user

scripts/kconfig/.nconf-cfg
.dynamic-kconfig.*
vagrant/Kconfig.passthrough_libvirt.generated
kconfigs/Kconfig.passthrough_libvirt.generated

archive/
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down Expand Up @@ -129,9 +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)

Expand Down Expand Up @@ -230,7 +226,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 \
Expand Down
16 changes: 0 additions & 16 deletions Makefile.kdevops
Original file line number Diff line number Diff line change
Expand Up @@ -25,37 +25,21 @@ 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)
@echo Installed dependencies
PHONY += kdevops_deps

Expand Down
11 changes: 3 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ an entire lab for Linux kernel testing for a complex subsystem in a jiffy.

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

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

License
-------
Expand Down
2 changes: 0 additions & 2 deletions docs/ansible-roles.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

The following local ansible roles are used:

* [update_ssh_config_vagrant](./playbooks/roles/update_ssh_config_vagrant/README.md)
* [devconfig](./playbooks/roles/devconfig/README.md)
* [create_partition](./playbooks/roles/create_partition/README.md)
* create_data_partition: creates the data partition, uses the `create_partition` role
* [install_terraform/](./playbooks/roles/install_terraform/README.md)
* [install_vagrant_boxes](./playbooks/roles/install_vagrant_boxes/README.md)
* [libvirt_user](./playbooks/roles/libvirt_user/README.md)
* [update_ssh_config_vagrant](./playbooks/roles/update_ssh_config_vagrant/README.md)

Expand Down
Loading
Loading