Cleanup

canonical · Feb 24, 2025 · a67d01e · a67d01e
1 parent 74afe5a
commit a67d01e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 44 deletions.
diff --git a/terraform/main.tf b/terraform/main.tf
@@ -680,7 +680,6 @@ resource "lxd_instance" "juju-controller" {
       command     = ["/bin/sh", "-c", "su ubuntu -c \"juju add-k8s control-plane-cluster --controller sdcore\""]
       trigger     = "once"
       fail_on_error = true
-      record_output = true
       environment = {
         "KUBECONFIG" = "/home/ubuntu/control-plane-cluster.yaml"
       }
@@ -691,7 +690,6 @@ resource "lxd_instance" "juju-controller" {
       gid         = 1000
       trigger     = "once"
       fail_on_error = true
-      record_output = true
     }
     "13-add-user-plane-cluster" = {
       command     = ["/bin/sh", "-c", "su ubuntu -c \"juju add-k8s user-plane-cluster --controller sdcore\""]
@@ -708,13 +706,11 @@ resource "lxd_instance" "juju-controller" {
       gid         = 1000
       trigger     = "once"
       fail_on_error = true
-      record_output = true
     }
     "15-add-gnb-cluster" = {
       command     = ["/bin/sh", "-c", "su ubuntu -c \"juju add-k8s gnb-cluster --controller sdcore\""]
       trigger     = "once"
       fail_on_error = true
-      record_output = true
       environment = {
         "KUBECONFIG" = "/home/ubuntu/gnb-cluster.yaml"
       }
@@ -725,7 +721,6 @@ resource "lxd_instance" "juju-controller" {
       gid         = 1000
       trigger     = "once"
       fail_on_error = true
-      record_output = true
     }
     "17-install-terraform" = {
       command     = ["snap", "install", "terraform", "--classic"]

diff --git a/terraform/outputs.tf b/terraform/outputs.tf
@@ -12,42 +12,3 @@ output "access-mac-address" {
     "out" = lxd_instance.user-plane.execs["06-get-access-mac-address"].stdout
   }
 }
-
-# output "control-plane-cluster" {
-#   value = {
-#     "out" = lxd_instance.juju-controller.execs["11-add-control-plane-cluster"].stdout
-#     "err" = lxd_instance.juju-controller.execs["11-add-control-plane-cluster"].stderr
-#   }
-# }
-# output "control-plane-model" {
-#   value = {
-#     "out" = lxd_instance.juju-controller.execs["12-add-control-plane-model"].stdout
-#     "err" = lxd_instance.juju-controller.execs["12-add-control-plane-model"].stderr
-#   }
-# }
-#
-# output "user-plane-cluster" {
-#   value = {
-#     "out" = lxd_instance.juju-controller.execs["13-add-user-plane-cluster"].stdout
-#     "err" = lxd_instance.juju-controller.execs["13-add-user-plane-cluster"].stderr
-#   }
-# }
-# output "user-plane-model" {
-#   value = {
-#     "out" = lxd_instance.juju-controller.execs["14-add-user-plane-model"].stdout
-#     "err" = lxd_instance.juju-controller.execs["14-add-user-plane-model"].stderr
-#   }
-# }
-#
-# output "gnbsim-cluster" {
-#   value = {
-#     "out" = lxd_instance.juju-controller.execs["15-add-gnb-cluster"].stdout
-#     "err" = lxd_instance.juju-controller.execs["15-add-gnb-cluster"].stderr
-#   }
-# }
-# output "gnbsim-model" {
-#   value = {
-#     "out" = lxd_instance.juju-controller.execs["16-add-gnbsim-model"].stdout
-#     "err" = lxd_instance.juju-controller.execs["16-add-gnbsim-model"].stderr
-#   }
-# }