updating rolling rolling_upgrade_policy and automatic_os_upgrade_policy and making them dynamic using os_upgrade_mode value for Window VM scale set.

Author: kumarvna

main.tf

@@ -358,7 +358,6 @@ resource "azurerm_linux_virtual_machine_scale_set" "linux_vmss" {
   lifecycle {
     ignore_changes = [
       tags,
-      ip_tag,
     ]
   }
 
@@ -452,16 +451,22 @@ resource "azurerm_windows_virtual_machine_scale_set" "winsrv_vmss" {
     }
   }
 
-  automatic_os_upgrade_policy {
-    disable_automatic_rollback  = true
-    enable_automatic_os_upgrade = true
+  dynamic "automatic_os_upgrade_policy" {
+    for_each = var.os_upgrade_mode == "Automatic" ? [1] : []
+    content {
+      disable_automatic_rollback  = true
+      enable_automatic_os_upgrade = true
+    }
   }
 
-  rolling_upgrade_policy {
-    max_batch_instance_percent              = 20
-    max_unhealthy_instance_percent          = 20
-    max_unhealthy_upgraded_instance_percent = 5
-    pause_time_between_batches              = "PT0S"
+  dynamic "rolling_upgrade_policy" {
+    for_each = var.os_upgrade_mode == "Automatic" ? [1] : []
+    content {
+      max_batch_instance_percent              = var.rolling_upgrade_policy.max_batch_instance_percent
+      max_unhealthy_instance_percent          = var.rolling_upgrade_policy.max_unhealthy_instance_percent
+      max_unhealthy_upgraded_instance_percent = var.rolling_upgrade_policy.max_unhealthy_upgraded_instance_percent
+      pause_time_between_batches              = var.rolling_upgrade_policy.pause_time_between_batches
+    }
   }
 
   automatic_instance_repair {

variables.tf

@@ -73,6 +73,16 @@ variable "lb_availability_zone" {
   default     = "Zone-Redundant"
 }
 
+variable "private_ip_address_allocation" {
+  description = "The allocation method for the Private IP Address used by this Load Balancer. Possible values as Dynamic and Static."
+  default     = "Dynamic"
+}
+
+variable "lb_private_ip_address" {
+  description = "Private IP Address to assign to the Load Balancer."
+  default     = null
+}
+
 variable "lb_probe_protocol" {
   description = "Specifies the protocol of the end point. Possible values are `Http`, `Https` or `Tcp`. If `Tcp` is specified, a received ACK is required for the probe to be successful. If `Http` is specified, a `200 OK` response from the specified `URI` is required for the probe to be successful."
   default     = null
@@ -220,6 +230,11 @@ variable "os_upgrade_mode" {
   default     = "Automatic"
 }
 
+variable "vm_time_zone" {
+  description = "Specifies the Time Zone which should be used by the Virtual Machine"
+  default     = null
+}
+
 variable "availability_zones" {
   description = "A list of Availability Zones in which the Virtual Machines in this Scale Set should be created in"
   default     = [1, 2, 3]
@@ -232,12 +247,12 @@ variable "availability_zone_balance" {
 
 variable "generate_admin_ssh_key" {
   description = "Generates a secure private key and encodes it as PEM."
-  default     = true
+  default     = false
 }
 
 variable "admin_ssh_key_data" {
   description = "specify the path to the existing ssh key to authenciate linux vm"
-  default     = ""
+  default     = null
 }
 
 variable "custom_image" {
@@ -469,15 +484,7 @@ variable "grace_period" {
 
 
 
-variable "private_ip_address_allocation" {
-  description = "The allocation method for the Private IP Address used by this Load Balancer. Possible values as Dynamic and Static."
-  default     = "Dynamic"
-}
 
-variable "lb_private_ip_address" {
-  description = "Private IP Address to assign to the Load Balancer."
-  default     = null
-}
 
 
 
@@ -535,11 +542,6 @@ variable "intall_iis_server_on_instances" {
   default     = false
 }
 
-variable "vm_time_zone" {
-  description = "Specifies the Time Zone which should be used by the Virtual Machine"
-  default     = null
-}
-
 variable "deploy_log_analytics_agent" {
   description = "Install log analytics agent to windows or linux VM scaleset instances"
   default     = false