Skip to content
Merged
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
2 changes: 1 addition & 1 deletion CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ make mmtests-compare # Generate comparison reports

### Infrastructure Support
- **Virtualization**: libguestfs with libvirt (recommended), legacy Vagrant
- **Cloud**: AWS, Azure, GCE, OCI, OpenStack support via Terraform
- **Cloud**: AWS, Azure, GCE, OCI support via Terraform
- **PCIe Passthrough**: Real hardware testing in VMs with dynamic device assignment
- **Mirror Support**: For air-gapped environments

Expand Down
35 changes: 0 additions & 35 deletions docs/kdevops-terraform.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Below are the list of clouds providers currently supported:
* aws - Amazon Web Service
* gce - Google Cloud Compute
* oci - Oracle Cloud Infrastructure
* openstack (special minicloud support added)

You configure which cloud provider you want to use, what feature from that
cloud provider you want to use, and then you can use kdevops to select which
Expand Down Expand Up @@ -173,40 +172,6 @@ application id. Set these values via "make menuconfig" in the
Terraform Providers submenu.


### Openstack

Openstack is supported. This solution relies on the clouds.yaml file for
openstack configuration. This simplifies setting up authentication
considerably.

#### Minicloud Openstack support

minicloud has a custom setup where the you have to SSH with a special port
depending on the IP address you get, if you enable minicloud we do this
computation for you and tell you where to SSH to, but we also have support
to update your ~/ssh/config for you.

Please note that minicloud takes a while to update its ports / mac address
tables, and so you may not be able to log in until after about 5 minutes after
you are able to create the nodes. Have patience.

Your terraform.tfvars may look something like:

```
instance_prefix = "my-random-project"

image_name = "Debian 10 ppc64le"
flavor_name = "minicloud.tiny"

ssh_config_pubkey_file = "~/.ssh/minicloud.pub"
ssh_config = "~/.ssh/config"
ssh_config_user = "debian"
ssh_config_update = "true"
ssh_config_use_strict_settings = "true"
ssh_config_backup = "true"

```

### AWS - Amazon Web Services

AWS is supported. For authentication, kdevops relies on a shared
Expand Down
1 change: 0 additions & 1 deletion kconfigs/Kconfig.bringup
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ config TERRAFORM

* Azure
* AWS
* OpenStack
* GCE

Enabling this option will enable installing terraform dependencies
Expand Down
2 changes: 1 addition & 1 deletion kconfigs/Kconfig.guestfs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ choice
config GUESTFS_DEBIAN_TRIXIE_GENERIC_AMD64
bool "debian-13-generic-amd64-daily"
help
Should run in any environment using cloud-init, for e.g. OpenStack,
Should run in any environment using cloud-init, for e.g.
DigitalOcean and also on bare metal. This is the image you should
try to use and stick to for kernel testing.

Expand Down
4 changes: 0 additions & 4 deletions kconfigs/Kconfig.libvirt
Original file line number Diff line number Diff line change
Expand Up @@ -936,13 +936,9 @@ config LIBVIRT_AIO_MODE_NATIVE
aio=native on sparsefiles. The claim seems to be that a host
filesystems metadata write can block the AIO io_submit() call and
therefore block QEMU threads which expect AIO behaviour on the guest.
This is documented when on Openstack nova an aio mode option was
requested to be available for different backends:

If you want to use PCIe passthrough you cannot use aio=native.

https://review.opendev.org/c/openstack/nova-specs/+/232514/7/specs/mitaka/approved/libvirt-aio-mode.rst

config LIBVIRT_AIO_MODE_THREADS
bool "aio=threads"
help
Expand Down
6 changes: 0 additions & 6 deletions playbooks/roles/gen_tfvars/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ terraform_aws_ebs_volume_type: "gp3"
terraform_oci_assign_public_ip: false
terraform_oci_use_existing_vcn: false

terraform_openstack_cloud_name: "invalid"
terraform_openstack_instance_prefix: "invalid"
terraform_openstack_flavor: "invalid"
terraform_openstack_image_name: "invalid"
terraform_openstack_ssh_pubkey_name: "invalid"

# Lambda Labs defaults
terraform_lambdalabs_region: "us-west-1"
terraform_lambdalabs_instance_type: "gpu_1x_a10"
Expand Down
18 changes: 0 additions & 18 deletions playbooks/roles/gen_tfvars/templates/openstack/terraform.tfvars.j2

This file was deleted.

4 changes: 0 additions & 4 deletions playbooks/roles/volume_group/tasks/terraform/openstack.yml

This file was deleted.

13 changes: 0 additions & 13 deletions scripts/terraform.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ endif
ifeq (y,$(CONFIG_TERRAFORM_OCI))
export KDEVOPS_CLOUD_PROVIDER=oci
endif
ifeq (y,$(CONFIG_TERRAFORM_OPENSTACK))
export KDEVOPS_CLOUD_PROVIDER=openstack
endif
ifeq (y,$(CONFIG_TERRAFORM_LAMBDALABS))
export KDEVOPS_CLOUD_PROVIDER=lambdalabs
endif
Expand Down Expand Up @@ -53,16 +50,6 @@ KDEVOPS_MRPROPER += $(KDEVOPS_NODES)

DEFAULT_DEPS_REQS_EXTRA_VARS += $(KDEVOPS_TFVARS)

ifeq (y,$(CONFIG_TERRAFORM_OPENSTACK))
TERRAFORM_EXTRA_VARS += terraform_openstack_cloud_name=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_OPENSTACK_CLOUD_NAME))
TERRAFORM_EXTRA_VARS += terraform_openstack_instance_prefix=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_OPENSTACK_INSTANCE_PREFIX))
TERRAFORM_EXTRA_VARS += terraform_openstack_flavor=$(subst ",,$(CONFIG_TERRAFORM_OPENSTACK_FLAVOR))
TERRAFORM_EXTRA_VARS += terraform_openstack_ssh_pubkey_name=$(subst ",,$(CONFIG_TERRAFORM_OPENSTACK_SSH_PUBKEY_NAME))
TERRAFORM_EXTRA_VARS += terraform_openstack_public_network_name=$(subst ",,$(CONFIG_TERRAFORM_OPENSTACK_PUBLIC_NETWORK_NAME))

ANSIBLE_EXTRA_ARGS_SEPARATED += terraform_openstack_image_name=$(subst $(space),+,$(CONFIG_TERRAFORM_OPENSTACK_IMAGE_NAME))
endif

ifeq (y,$(CONFIG_TERRAFORM_PRIVATE_NET))
TERRAFORM_EXTRA_VARS += terraform_private_net_enabled='true'
TERRAFORM_EXTRA_VARS += terraform_private_net_prefix=$(subst ",,$(CONFIG_TERRAFORM_PRIVATE_NET_PREFIX))
Expand Down
2 changes: 1 addition & 1 deletion terraform/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ endmenu

config TERRAFORM_PRIVATE_NET
bool "Add a private network for the guests"
depends on TERRAFORM_OPENSTACK || TERRAFORM_AZURE
depends on TERRAFORM_AZURE
default y
help
This option adds a private network between the various guests
Expand Down
7 changes: 0 additions & 7 deletions terraform/Kconfig.providers
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ config TERRAFORM_OCI
Enabling this means you are going to use OCI for your cloud
solution.

config TERRAFORM_OPENSTACK
bool "OpenStack"
help
Enabling this means you are going to use OpenStack for your cloud
solution.

config TERRAFORM_LAMBDALABS
bool "Lambda Labs"
depends on TARGET_ARCH_X86_64
Expand All @@ -62,6 +56,5 @@ source "terraform/gce/Kconfig"
source "terraform/aws/Kconfig"
source "terraform/azure/Kconfig"
source "terraform/oci/Kconfig"
source "terraform/openstack/Kconfig"
source "terraform/lambdalabs/Kconfig"
source "terraform/rcloud/Kconfig"
66 changes: 0 additions & 66 deletions terraform/openstack/Kconfig

This file was deleted.

1 change: 0 additions & 1 deletion terraform/openstack/ansible_provision_cmd.tpl

This file was deleted.

19 changes: 0 additions & 19 deletions terraform/openstack/clouds-public.yaml

This file was deleted.

107 changes: 0 additions & 107 deletions terraform/openstack/main.tf

This file was deleted.

Loading
Loading