Restore cloud_integration

.github/workflows/plan-terraform.yaml

@@ -19,12 +19,12 @@ jobs:
         test:
         - name: Openstack
           yaml: test/openstack.yaml
-          cloud_integration: "true"
+          cloud_integration: openstaack
         - name: Vanilla
           yaml: test/vanilla.yaml
-          cloud_integration: "false"
+          cloud_integration: ''
     env:
-      TF_VAR_model: '{"name": "test", "cloud": "openstack", "config": {"test": true}}'
+      TF_VAR_model: '{"name": "test", "cloud": "prod-k8s-openstack", "config": {"test": true}}'
       TF_VAR_manifest_yaml: ${{ matrix.test.yaml }}
       TF_VAR_cloud_integration: ${{ matrix.test.cloud_integration }}
       WORKING_DIR: 'terraform'

terraform/README.md

@@ -48,8 +48,9 @@ module "k8s" {
   source        = "git::https://github.com/canonical/k8s-bundles//terraform?ref=main" 
   model         = {
     name = "my-canonical-k8s"
-    cloud = "openstack"
+    cloud = "prod-example-openstack"
   }
+  cloud_integration = "openstack"
   manifest_yaml = "/path/to/manifest.yaml"
 }
 ```
@@ -58,15 +59,15 @@ Define your manifest.yaml based on the requirements for your deployment. Specifi
 
 ```yaml
 k8s:
-    units: 3
-    base: [email protected]
-    constraints: arch=amd64 cores=2 mem=4096M root-disk=16384M
-    channel: 1.32/stable
+  units: 3
+  base: [email protected]
+  constraints: arch=amd64 cores=2 mem=4096M root-disk=16384M
+  channel: 1.32/stable
 k8s_worker:
-    units: 2
-    base: [email protected]
-    constraints: arch=amd64 cores=2 mem=8192M root-disk=16384M
-    channel: 1.32/stable
+  units: 2
+  base: [email protected]
+  constraints: arch=amd64 cores=2 mem=8192M root-disk=16384M
+  channel: 1.32/stable
 ```
 
 <!--LINKS -->

terraform/applications.tf

@@ -34,7 +34,7 @@ module "k8s_worker" {
 }
 
 module "openstack" {
-  count           = (var.model.cloud == "openstack" && var.cloud_integration) ? 1 : 0
+  count           = (var.cloud_integration == "openstack" ) ? 1 : 0
   source          = "./openstack"
   model           = resource.juju_model.this.name
   manifest_yaml   = var.manifest_yaml

terraform/test/openstack.yaml

@@ -1,15 +1,15 @@
 k8s:
-    units: 3
-    base: [email protected]
-    constraints: arch=amd64 cores=2 mem=8G root-disk=16G
-    channel: latest/edge
+  units: 3
+  base: [email protected]
+  constraints: arch=amd64 cores=2 mem=8192M root-disk=16384M
+  channel: latest/edge
 k8s_worker:
-    units: 3
-    base: [email protected]
-    constraints: arch=amd64 cores=2 mem=8G root-disk=16G
-    channel: latest/edge
+  units: 3
+  base: [email protected]
+  constraints: arch=amd64 cores=2 mem=8192M root-disk=16384M
+  channel: latest/edge
 openstack_integrator:
-    channel: 1.31/stable
-    base: [email protected]
+  channel: 1.31/stable
+  base: [email protected]
 cinder_csi: {}
 openstack_cloud_controller: {}

terraform/test/vanilla.yaml

@@ -1,10 +1,10 @@
 k8s:
-    units: 3
-    base: [email protected]
-    constraints: arch=amd64 cores=2 mem=8192M root-disk=16384M
-    channel: latest/edge
+  units: 3
+  base: [email protected]
+  constraints: arch=amd64 cores=2 mem=8192M root-disk=16384M
+  channel: latest/edge
 k8s_worker:
-    units: 3
-    base: [email protected]
-    constraints: arch=amd64 cores=2 mem=8192M root-disk=16384M
-    channel: latest/edge
+  units: 3
+  base: [email protected]
+  constraints: arch=amd64 cores=2 mem=8192M root-disk=16384M
+  channel: latest/edge

terraform/variables.tf

@@ -7,9 +7,14 @@ variable "manifest_yaml" {
 }
 
 variable "cloud_integration" {
-  description = "Enable cloud integration."
-  type        = bool
-  default     = false
+  description = "Selection of a cloud integration."
+  type        = string
+  default     = ""
+
+  validation {
+    condition = can(regex("^(|openstack)$", var.cloud_integration))
+    error_message = "Cloud integration must be one of: '', openstack."
+  }
 }
 
 variable "model" {