Fixing model name param in cross-model relations

canonical · Feb 23, 2024 · 9c37862 · 9c37862
1 parent 11642b9
commit 9c37862
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/modules/sdcore-control-plane-k8s/main.tf b/modules/sdcore-control-plane-k8s/main.tf
@@ -513,7 +513,7 @@ resource "juju_offer" "loki-logging" {
 
 resource "juju_integration" "prometheus" {
   count = var.deploy_cos ? 1 : 0
-  model = juju_model.sdcore[0].name
+  model = var.model_name
 
   application {
     name     = module.grafana-agent.app_name
@@ -527,7 +527,7 @@ resource "juju_integration" "prometheus" {
 
 resource "juju_integration" "loki" {
   count = var.deploy_cos ? 1 : 0
-  model = juju_model.sdcore[0].name
+  model = var.model_name
 
   application {
     name     = module.grafana-agent.app_name

diff --git a/modules/sdcore-k8s/main.tf b/modules/sdcore-k8s/main.tf
@@ -550,7 +550,7 @@ resource "juju_offer" "loki-logging" {
 
 resource "juju_integration" "prometheus" {
   count = var.deploy_cos ? 1 : 0
-  model = juju_model.sdcore[0].name
+  model = var.model_name
 
   application {
     name     = module.grafana-agent.app_name
@@ -564,7 +564,7 @@ resource "juju_integration" "prometheus" {
 
 resource "juju_integration" "loki" {
   count = var.deploy_cos ? 1 : 0
-  model = juju_model.sdcore[0].name
+  model = var.model_name
 
   application {
     name     = module.grafana-agent.app_name

diff --git a/modules/sdcore-user-plane-k8s/main.tf b/modules/sdcore-user-plane-k8s/main.tf
@@ -61,7 +61,7 @@ resource "juju_offer" "loki-logging" {
 
 resource "juju_integration" "prometheus" {
   count = var.deploy_cos ? 1 : 0
-  model = juju_model.sdcore[0].name
+  model = var.model_name
 
   application {
     name     = module.grafana-agent.app_name
@@ -75,7 +75,7 @@ resource "juju_integration" "prometheus" {
 
 resource "juju_integration" "loki" {
   count = var.deploy_cos ? 1 : 0
-  model = juju_model.sdcore[0].name
+  model = var.model_name
 
   application {
     name     = module.grafana-agent.app_name