From 62831a4e810adb9b4f3dadd910cd9e9d30eb0009 Mon Sep 17 00:00:00 2001
From: Arif Ali <arif.ali@canonical.com>
Date: Wed, 5 Jun 2024 18:20:18 +0100
Subject: [PATCH] fine tuning the landscape bits

---
 juju/home-maas/00-variables.tf        | 27 ++++++++++++++++++
 juju/home-maas/09-landscape-client.tf | 41 +--------------------------
 2 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/juju/home-maas/00-variables.tf b/juju/home-maas/00-variables.tf
index 432141e..5c140a1 100644
--- a/juju/home-maas/00-variables.tf
+++ b/juju/home-maas/00-variables.tf
@@ -31,6 +31,33 @@ variable apt_mirror {
     default = "192.168.1.12"
 }
 
+variable "all_services" {
+  type    = list(string)
+  default = [
+    "easyrsa",
+    "etcd",
+    "ceilometer",
+    "ceph-mon",
+#    "ceph-osd",
+    "ceph-radosgw",
+    "cinder",
+    "glance",
+    "gnocchi",
+    "heat",
+    "keystone",
+    "memcached",
+    "mysql-innodb-cluster",
+    "neutron-api",
+    "neutron-gateway",
+    "nova-compute-kvm",
+    "nova-cloud-controller",
+    "openstack-dashboard",
+    "placement",
+    "rabbitmq-server",
+    "vault",
+  ]
+}
+
 ######## vars unlikely to be changed
 variable "machines" {
   type = list(object({
diff --git a/juju/home-maas/09-landscape-client.tf b/juju/home-maas/09-landscape-client.tf
index 2badfc7..a94ec51 100644
--- a/juju/home-maas/09-landscape-client.tf
+++ b/juju/home-maas/09-landscape-client.tf
@@ -72,47 +72,8 @@ resource "juju_application" "landscape-client" {
   }
 }
 
-variable "openstack_services" {
-  type    = list(string)
-  default = [
-    "ceilometer",
-    "ceph-mon",
-    "ceph-radosgw",
-    "cinder",
-    "glance",
-    "gnocchi",
-    "heat",
-    "keystone",
-    "memcached",
-    "mysql-innodb-cluster",
-    "neutron-api",
-    "neutron-gateway",
-    "nova-cloud-controller",
-    "openstack-dashboard",
-    "placement",
-    "rabbitmq-server",
-    "vault",
-  ]
-}
-
-
-resource "juju_integration" "landscape-nova-compute-kvm" {
-
-  model = var.model-name
-
-  application {
-    name     = juju_application.landscape-client.name
-    endpoint = "container"
-  }
-
-  application {
-    name     = juju_application.nova-compute-kvm.name
-    endpoint = "juju-info"
-  }
-}
-
 resource "juju_integration" "landscape-client-integration" {
-  for_each = toset(var.openstack_services)
+  for_each = toset(var.all_services)
 
   model = var.model-name