Allow definition of upgrade value per instance

Author: cmd-ntrf

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
 }
 
@@ -215,6 +215,7 @@ locals {
       local_ip  = aws_network_interface.nic[x].private_ip
       prefix    = values.prefix
       tags      = values.tags
+      upgrade   = values.upgrade
       specs = merge({
         cpus = data.aws_ec2_instance_type.instance_type[values.prefix].default_vcpus
         ram  = data.aws_ec2_instance_type.instance_type[values.prefix].memory_size

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
 }
 
@@ -172,6 +172,7 @@ locals {
       local_ip  = azurerm_network_interface.nic[x].private_ip_address
       prefix    = values.prefix
       tags      = values.tags
+      upgrade   = values.upgrade
       specs = merge({
         cpus = local.vmsizes[values.type].vcpus
         ram  = local.vmsizes[values.type].ram

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 = {

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) }
             },
           )
         }

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" {}

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
 }
 
@@ -178,6 +178,7 @@ locals {
       local_ip  = google_compute_address.nic[x].address
       prefix    = values.prefix
       tags      = values.tags
+      upgrade   = values.upgrade
       specs = merge({
         cpus = data.external.machine_type[values["prefix"]].result["vcpus"]
         ram  = data.external.machine_type[values["prefix"]].result["ram"]

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
 }
 
@@ -154,6 +154,7 @@ locals {
     host => {
       prefix  = values.prefix
       tags    = values.tags
+      upgrade = values.upgrade
       specs   = values.specs
       volumes = {}
     }

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
 }
 
@@ -136,6 +136,7 @@ locals {
       local_ip  = openstack_networking_port_v2.nic[x].all_fixed_ips[0]
       prefix    = values.prefix
       tags      = values.tags
+      upgrade   = values.upgrade
       specs = merge({
         cpus = data.openstack_compute_flavor_v2.flavors[values.type].vcpus
         ram  = data.openstack_compute_flavor_v2.flavors[values.type].ram