Update all bases and hosts backend.

uyuni-project · Oct 2, 2024 · 143389b · 143389b
1 parent cafd45d
commit 143389b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/backend_modules/aws/base/main.tf b/backend_modules/aws/base/main.tf
@@ -48,6 +48,7 @@ locals {
   configuration_output = merge({
     cc_username              = var.cc_username
     cc_password              = var.cc_password
+    product_version          = var.product_version
     timezone                 = var.timezone
     use_ntp                  = var.use_ntp
     ssh_key_path             = var.ssh_key_path

diff --git a/backend_modules/aws/host/main.tf b/backend_modules/aws/host/main.tf
@@ -33,6 +33,7 @@ locals {
   overwrite_fqdn                       = local.route53_domain == null ? local.provider_settings["overwrite_fqdn"] : "${var.base_configuration["name_prefix"]}${var.name}.${var.base_configuration["route53_domain"]}"
   route53_zone_id                      = lookup(var.base_configuration, "route53_zone_id", null)
   route53_domain                       = lookup(var.base_configuration, "route53_domain", null)
+  product_version                      = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
 
   resource_name_prefix = "${var.base_configuration["name_prefix"]}${var.name}"
 
@@ -245,6 +246,7 @@ resource "null_resource" "host_salt_configuration" {
         use_ntp                   = var.base_configuration["use_ntp"]
         testsuite                 = var.base_configuration["testsuite"]
         roles                     = var.roles
+        product_version           = local.product_version
         use_os_released_updates   = var.use_os_released_updates
         additional_repos          = var.additional_repos
         additional_repos_only     = var.additional_repos_only

diff --git a/backend_modules/azure/base/main.tf b/backend_modules/azure/base/main.tf
@@ -136,6 +136,7 @@ locals {
   configuration_output = merge({
     cc_username          = var.cc_username
     cc_password          = var.cc_password
+    product_version      = var.product_version
     timezone             = var.timezone
     use_ntp              = var.use_ntp
     ssh_key_path         = var.ssh_key_path

diff --git a/backend_modules/azure/host/main.tf b/backend_modules/azure/host/main.tf
@@ -25,10 +25,11 @@ locals {
   public_security_group_id             = var.base_configuration.public_security_group_id
   private_security_group_id            = var.base_configuration.private_security_group_id
   private_additional_security_group_id = var.base_configuration.private_additional_security_group_id
-  resource_group_name = var.base_configuration.resource_group_name
-  resource_name_prefix = "${var.base_configuration["name_prefix"]}${var.name}"
-  public_instance = lookup(var.provider_settings, "public_instance", false)
-  location            = var.base_configuration["location"]
+  resource_group_name                  = var.base_configuration.resource_group_name
+  resource_name_prefix                 = "${var.base_configuration["name_prefix"]}${var.name}"
+  public_instance                      = lookup(var.provider_settings, "public_instance", false)
+  location                             = var.base_configuration["location"]
+  product_version                      = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
 }
 
 data "template_file" "user_data" {
@@ -181,6 +182,7 @@ resource "azurerm_virtual_machine_data_disk_attachment" "addtionaldisks-attach"
         use_ntp                   = var.base_configuration["use_ntp"]
         testsuite                 = var.base_configuration["testsuite"]
         roles                     = var.roles
+        product_version           = local.product_version
         use_os_released_updates   = var.use_os_released_updates
         additional_repos          = var.additional_repos
         additional_repos_only     = var.additional_repos_only

diff --git a/backend_modules/feilong/base/main.tf b/backend_modules/feilong/base/main.tf
@@ -7,9 +7,10 @@ locals {
 
 output "configuration" {
   value = {
-    name_prefix  = local.name_prefix
-    domain       = local.domain
-    ssh_key_path = local.ssh_key_path
-    key_file     = local.key_file
+    name_prefix     = local.name_prefix
+    domain          = local.domain
+    ssh_key_path    = local.ssh_key_path
+    key_file        = local.key_file
+    product_version = var.product_version
   }
 }
diff --git a/backend_modules/feilong/host/main.tf b/backend_modules/feilong/host/main.tf
@@ -2,6 +2,7 @@ locals {
   name_prefix       = var.base_configuration["name_prefix"]
   domain            = var.base_configuration["domain"]
   ssh_key_path      = var.base_configuration["ssh_key_path"]
+  product_version   = var.product_version != null ? var.product_version : var.base_configuration["product_version"]
   provider_settings = merge({
     userid   = null
     memory   = "2G"
@@ -61,7 +62,7 @@ resource "null_resource" "provisioning" {
         use_avahi                     = false
         provider                      = "feilong"
         roles                         = var.roles
-        product_version               = var.product_version
+        product_version               = local.product_version
         use_os_released_updates       = var.use_os_released_updates
         additional_repos              = var.additional_repos
         additional_repos_only         = var.additional_repos_only

diff --git a/backend_modules/null/base/main.tf b/backend_modules/null/base/main.tf
@@ -33,5 +33,6 @@ output "configuration" {
     name_prefix          = var.name_prefix
     use_shared_resources = var.use_shared_resources
     testsuite            = var.testsuite
+    product_version      = var.product_version
   }
 }