Skip to content

Commit 1cb3ea5

Browse files
authored
Merge pull request #58 from linux-kdevops/cel/remove-open-stack
Remove the OpenStack terraform provider
2 parents ed3b5cd + 5ff22d6 commit 1cb3ea5

File tree

21 files changed

+3
-458
lines changed

21 files changed

+3
-458
lines changed

CLAUDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ make mmtests-compare # Generate comparison reports
220220

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

docs/kdevops-terraform.md

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Below are the list of clouds providers currently supported:
1111
* aws - Amazon Web Service
1212
* gce - Google Cloud Compute
1313
* oci - Oracle Cloud Infrastructure
14-
* openstack (special minicloud support added)
1514

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

175174

176-
### Openstack
177-
178-
Openstack is supported. This solution relies on the clouds.yaml file for
179-
openstack configuration. This simplifies setting up authentication
180-
considerably.
181-
182-
#### Minicloud Openstack support
183-
184-
minicloud has a custom setup where the you have to SSH with a special port
185-
depending on the IP address you get, if you enable minicloud we do this
186-
computation for you and tell you where to SSH to, but we also have support
187-
to update your ~/ssh/config for you.
188-
189-
Please note that minicloud takes a while to update its ports / mac address
190-
tables, and so you may not be able to log in until after about 5 minutes after
191-
you are able to create the nodes. Have patience.
192-
193-
Your terraform.tfvars may look something like:
194-
195-
```
196-
instance_prefix = "my-random-project"
197-
198-
image_name = "Debian 10 ppc64le"
199-
flavor_name = "minicloud.tiny"
200-
201-
ssh_config_pubkey_file = "~/.ssh/minicloud.pub"
202-
ssh_config = "~/.ssh/config"
203-
ssh_config_user = "debian"
204-
ssh_config_update = "true"
205-
ssh_config_use_strict_settings = "true"
206-
ssh_config_backup = "true"
207-
208-
```
209-
210175
### AWS - Amazon Web Services
211176

212177
AWS is supported. For authentication, kdevops relies on a shared

kconfigs/Kconfig.bringup

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ config TERRAFORM
4545

4646
* Azure
4747
* AWS
48-
* OpenStack
4948
* GCE
5049

5150
Enabling this option will enable installing terraform dependencies

kconfigs/Kconfig.guestfs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ choice
147147
config GUESTFS_DEBIAN_TRIXIE_GENERIC_AMD64
148148
bool "debian-13-generic-amd64-daily"
149149
help
150-
Should run in any environment using cloud-init, for e.g. OpenStack,
150+
Should run in any environment using cloud-init, for e.g.
151151
DigitalOcean and also on bare metal. This is the image you should
152152
try to use and stick to for kernel testing.
153153

kconfigs/Kconfig.libvirt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -936,13 +936,9 @@ config LIBVIRT_AIO_MODE_NATIVE
936936
aio=native on sparsefiles. The claim seems to be that a host
937937
filesystems metadata write can block the AIO io_submit() call and
938938
therefore block QEMU threads which expect AIO behaviour on the guest.
939-
This is documented when on Openstack nova an aio mode option was
940-
requested to be available for different backends:
941939

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

944-
https://review.opendev.org/c/openstack/nova-specs/+/232514/7/specs/mitaka/approved/libvirt-aio-mode.rst
945-
946942
config LIBVIRT_AIO_MODE_THREADS
947943
bool "aio=threads"
948944
help

playbooks/roles/gen_tfvars/defaults/main.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,6 @@ terraform_aws_ebs_volume_type: "gp3"
3131
terraform_oci_assign_public_ip: false
3232
terraform_oci_use_existing_vcn: false
3333

34-
terraform_openstack_cloud_name: "invalid"
35-
terraform_openstack_instance_prefix: "invalid"
36-
terraform_openstack_flavor: "invalid"
37-
terraform_openstack_image_name: "invalid"
38-
terraform_openstack_ssh_pubkey_name: "invalid"
39-
4034
# Lambda Labs defaults
4135
terraform_lambdalabs_region: "us-west-1"
4236
terraform_lambdalabs_instance_type: "gpu_1x_a10"

playbooks/roles/gen_tfvars/templates/openstack/terraform.tfvars.j2

Lines changed: 0 additions & 18 deletions
This file was deleted.

playbooks/roles/volume_group/tasks/terraform/openstack.yml

Lines changed: 0 additions & 4 deletions
This file was deleted.

scripts/terraform.Makefile

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ endif
1818
ifeq (y,$(CONFIG_TERRAFORM_OCI))
1919
export KDEVOPS_CLOUD_PROVIDER=oci
2020
endif
21-
ifeq (y,$(CONFIG_TERRAFORM_OPENSTACK))
22-
export KDEVOPS_CLOUD_PROVIDER=openstack
23-
endif
2421
ifeq (y,$(CONFIG_TERRAFORM_LAMBDALABS))
2522
export KDEVOPS_CLOUD_PROVIDER=lambdalabs
2623
endif
@@ -53,16 +50,6 @@ KDEVOPS_MRPROPER += $(KDEVOPS_NODES)
5350

5451
DEFAULT_DEPS_REQS_EXTRA_VARS += $(KDEVOPS_TFVARS)
5552

56-
ifeq (y,$(CONFIG_TERRAFORM_OPENSTACK))
57-
TERRAFORM_EXTRA_VARS += terraform_openstack_cloud_name=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_OPENSTACK_CLOUD_NAME))
58-
TERRAFORM_EXTRA_VARS += terraform_openstack_instance_prefix=$(subst ",,$(CONFIG_TERRAFORM_TERRAFORM_OPENSTACK_INSTANCE_PREFIX))
59-
TERRAFORM_EXTRA_VARS += terraform_openstack_flavor=$(subst ",,$(CONFIG_TERRAFORM_OPENSTACK_FLAVOR))
60-
TERRAFORM_EXTRA_VARS += terraform_openstack_ssh_pubkey_name=$(subst ",,$(CONFIG_TERRAFORM_OPENSTACK_SSH_PUBKEY_NAME))
61-
TERRAFORM_EXTRA_VARS += terraform_openstack_public_network_name=$(subst ",,$(CONFIG_TERRAFORM_OPENSTACK_PUBLIC_NETWORK_NAME))
62-
63-
ANSIBLE_EXTRA_ARGS_SEPARATED += terraform_openstack_image_name=$(subst $(space),+,$(CONFIG_TERRAFORM_OPENSTACK_IMAGE_NAME))
64-
endif
65-
6653
ifeq (y,$(CONFIG_TERRAFORM_PRIVATE_NET))
6754
TERRAFORM_EXTRA_VARS += terraform_private_net_enabled='true'
6855
TERRAFORM_EXTRA_VARS += terraform_private_net_prefix=$(subst ",,$(CONFIG_TERRAFORM_PRIVATE_NET_PREFIX))

terraform/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ endmenu
1010

1111
config TERRAFORM_PRIVATE_NET
1212
bool "Add a private network for the guests"
13-
depends on TERRAFORM_OPENSTACK || TERRAFORM_AZURE
13+
depends on TERRAFORM_AZURE
1414
default y
1515
help
1616
This option adds a private network between the various guests

0 commit comments

Comments
 (0)