QE: Change grafana module to remove hardcoded values

uyuni-project · Nov 28, 2022 · c78183b · c78183b
1 parent ac30989
commit c78183b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 221 deletions.
diff --git a/modules/grafana/main.tf b/modules/grafana/main.tf
@@ -10,10 +10,10 @@ module "grafana" {
     mirror          = var.base_configuration["mirror"]
     server          = var.server_configuration["hostname"]
     locust          = var.locust_configuration["hostname"]
-    product_version = "4.2-nightly"
+    product_version = var.product_version
   }
 
-  image   = "sles12sp5"
+  image   = var.image
   provider_settings = var.provider_settings
 }
 

diff --git a/modules/grafana/variables.tf b/modules/grafana/variables.tf
@@ -32,3 +32,13 @@ variable "provider_settings" {
   description = "Map of provider-specific settings, see the backend-specific README file"
   default     = {}
 }
+
+variable "product_version" {
+  description = "A valid SUSE Manager version (eg. 4.2-nightly, head) see README_ADVANCED.md"
+  default     = "released"
+}
+
+variable "image" {
+  description = "An image name, e.g. sles12sp4 or opensuse154o"
+  type        = string
+}
diff --git a/modules/monitoring_server/main.tf b/modules/monitoring_server/main.tf
diff --git a/modules/monitoring_server/variables.tf b/modules/monitoring_server/variables.tf
diff --git a/modules/monitoring_server/versions.tf b/modules/monitoring_server/versions.tf
diff --git a/salt/monitoring_server/certs/ca.cert.pem b/salt/monitoring_server/certs/ca.cert.pem
diff --git a/salt/monitoring_server/init.sls b/salt/monitoring_server/init.sls