Allow definition of upgrade value per instance

cmd-ntrf · cmd-ntrf · commit 82a9a3b6f5a5 · 2026-07-10T12:35:19.000-04:00
diff --git a/aws/infrastructure.tf b/aws/infrastructure.tf
@@ -14,6 +14,7 @@ module "design" {
   volumes        = var.volumes
   firewall_rules = var.firewall_rules
   bastion_tags   = var.bastion_tags
+  upgrade        = var.upgrade
 }
 
 module "configuration" {
@@ -31,7 +32,6 @@ module "configuration" {
   software_stack  = var.software_stack
   cloud_provider  = local.cloud_provider
   cloud_region    = local.cloud_region
-  upgrade         = var.upgrade
   puppet_conf     = var.puppet_conf
 }
 
diff --git a/azure/infrastructure.tf b/azure/infrastructure.tf
@@ -14,6 +14,7 @@ module "design" {
   volumes        = var.volumes
   firewall_rules = var.firewall_rules
   bastion_tags   = var.bastion_tags
+  upgrade        = var.upgrade
 }
 
 module "configuration" {
@@ -31,7 +32,6 @@ module "configuration" {
   software_stack  = var.software_stack
   cloud_provider  = local.cloud_provider
   cloud_region    = local.cloud_region
-  upgrade         = var.upgrade
   puppet_conf     = var.puppet_conf
 }
 
diff --git a/common/configuration/main.tf b/common/configuration/main.tf
@@ -23,7 +23,6 @@ variable "guest_passwd" {}
 
 variable "public_keys" {}
 
-variable "upgrade" {}
 variable "bastion_tags" {}
 
 resource "tls_private_key" "ssh" {
@@ -127,7 +126,7 @@ locals {
         ssh_authorized_keys   = local.public_keys
         tf_ssh_public_key     = chomp(tls_private_key.ssh.public_key_openssh)
         terraform_facts       = local.terraform_facts
-        upgrade               = var.upgrade
+        upgrade               = values.upgrade
         module_path           = path.module
         user_tf_required      = contains(values.tags, "puppet") || length(setintersection(values.tags, var.bastion_tags)) > 0
         hostkeys = {
diff --git a/common/design/main.tf b/common/design/main.tf
@@ -15,11 +15,12 @@ locals {
         for i in range(lookup(attrs, "count", 1)) : {
           (format("%s%d", prefix, i + 1)) = merge(
             { image = var.image },
+            { upgrade = var.upgrade },
             { disk_size = max(var.min_disk_size, [for tag in attrs.tags : lookup(local.min_disk_size_per_tags, tag, 0)]...) },
             { for attr, value in attrs : attr => value if !contains(["count"], attr) },
             {
               prefix = prefix,
-              specs  = { for attr, value in attrs : attr => value if !contains(["count", "tags", "image"], attr) }
+              specs  = { for attr, value in attrs : attr => value if !contains(["count", "tags", "image", "upgrade"], attr) }
             },
           )
         }
diff --git a/common/design/variables.tf b/common/design/variables.tf
@@ -6,4 +6,5 @@ variable "pool" {}
 variable "firewall_rules" {}
 variable "min_disk_size" {}
 variable "image" {}
-variable "bastion_tags" {}
+variable "bastion_tags" {}
+variable "upgrade" {}
diff --git a/gcp/infrastructure.tf b/gcp/infrastructure.tf
@@ -14,6 +14,7 @@ module "design" {
   volumes        = var.volumes
   firewall_rules = var.firewall_rules
   bastion_tags   = var.bastion_tags
+  upgrade        = var.upgrade
 }
 
 module "configuration" {
@@ -31,7 +32,6 @@ module "configuration" {
   software_stack  = var.software_stack
   cloud_provider  = local.cloud_provider
   cloud_region    = local.cloud_region
-  upgrade         = var.upgrade
   puppet_conf     = var.puppet_conf
 }
 
diff --git a/incus/infrastructure.tf b/incus/infrastructure.tf
@@ -9,6 +9,7 @@ module "design" {
   volumes        = var.volumes
   firewall_rules = var.firewall_rules
   bastion_tags   = var.bastion_tags
+  upgrade        = var.upgrade
 }
 
 module "configuration" {
@@ -27,7 +28,6 @@ module "configuration" {
   software_stack  = var.software_stack
   cloud_provider  = "incus"
   cloud_region    = "local"
-  upgrade         = var.upgrade
   puppet_conf     = var.puppet_conf
 }
 
diff --git a/openstack/infrastructure.tf b/openstack/infrastructure.tf
@@ -9,6 +9,7 @@ module "design" {
   volumes        = var.volumes
   firewall_rules = var.firewall_rules
   bastion_tags   = var.bastion_tags
+  upgrade        = var.upgrade
 }
 
 module "configuration" {
@@ -26,7 +27,6 @@ module "configuration" {
   software_stack  = var.software_stack
   cloud_provider  = local.cloud_provider
   cloud_region    = local.cloud_region
-  upgrade         = var.upgrade
   puppet_conf     = var.puppet_conf
 }
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ module "design" {`
`14`	`14`	`volumes = var.volumes`
`15`	`15`	`firewall_rules = var.firewall_rules`
`16`	`16`	`bastion_tags = var.bastion_tags`
	`17`	`+ upgrade = var.upgrade`
`17`	`18`	`}`
`18`	`19`
`19`	`20`	`module "configuration" {`
`@@ -31,7 +32,6 @@ module "configuration" {`
`31`	`32`	`software_stack = var.software_stack`
`32`	`33`	`cloud_provider = local.cloud_provider`
`33`	`34`	`cloud_region = local.cloud_region`
`34`		`- upgrade = var.upgrade`
`35`	`35`	`puppet_conf = var.puppet_conf`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,12 @@ locals {`
`15`	`15`	`for i in range(lookup(attrs, "count", 1)) : {`
`16`	`16`	`(format("%s%d", prefix, i + 1)) = merge(`
`17`	`17`	`{ image = var.image },`
	`18`	`+ { upgrade = var.upgrade },`
`18`	`19`	`{ disk_size = max(var.min_disk_size, [for tag in attrs.tags : lookup(local.min_disk_size_per_tags, tag, 0)]...) },`
`19`	`20`	`{ for attr, value in attrs : attr => value if !contains(["count"], attr) },`
`20`	`21`	`{`
`21`	`22`	`prefix = prefix,`
`22`		`- specs = { for attr, value in attrs : attr => value if !contains(["count", "tags", "image"], attr) }`
	`23`	`+ specs = { for attr, value in attrs : attr => value if !contains(["count", "tags", "image", "upgrade"], attr) }`
`23`	`24`	`},`
`24`	`25`	`)`
`25`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ module "design" {`
`9`	`9`	`volumes = var.volumes`
`10`	`10`	`firewall_rules = var.firewall_rules`
`11`	`11`	`bastion_tags = var.bastion_tags`
	`12`	`+ upgrade = var.upgrade`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`module "configuration" {`
`@@ -27,7 +28,6 @@ module "configuration" {`
`27`	`28`	`software_stack = var.software_stack`
`28`	`29`	`cloud_provider = "incus"`
`29`	`30`	`cloud_region = "local"`
`30`		`- upgrade = var.upgrade`
`31`	`31`	`puppet_conf = var.puppet_conf`
`32`	`32`	`}`
`33`	`33`