From e933a3ae33ff4aba1c75218eb79d52fb3f5ebcdc Mon Sep 17 00:00:00 2001 From: vandabarata Date: Mon, 28 Nov 2022 21:14:02 +0000 Subject: [PATCH] QE: Change grafana module to remove hardcoded values --- modules/grafana/main.tf | 4 ++-- modules/grafana/variables.tf | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/grafana/main.tf b/modules/grafana/main.tf index 9971c9e65..95cb72dda 100644 --- 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 index 7dfb15831..8cc056cbd 100644 --- 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 +}