Skip to content

Commit 88dab1c

Browse files
committed
feat(CGNSPC-2249): Azure | Add LegacyVMNVA tag to disable MANA
1 parent f827e5d commit 88dab1c

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

modules/high-availability/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ resource "azurerm_virtual_machine" "vm_instance_availability_set" {
455455
storage_uri = module.vm_boot_diagnostics_storage.storage_account_primary_blob_endpoint
456456
}
457457

458-
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
458+
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
459459
}
460460

461461
resource "azurerm_virtual_machine" "vm_instance_availability_zone" {
@@ -552,7 +552,7 @@ resource "azurerm_virtual_machine" "vm_instance_availability_zone" {
552552
storage_uri = module.vm_boot_diagnostics_storage.storage_account_primary_blob_endpoint
553553
}
554554

555-
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
555+
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
556556
}
557557

558558
resource "azurerm_linux_virtual_machine" "vm_instance_availability_zone_extended" {
@@ -651,7 +651,7 @@ resource "azurerm_linux_virtual_machine" "vm_instance_availability_zone_extended
651651
}
652652
}
653653

654-
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
654+
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
655655
}
656656

657657
//********************** Role Assigments **************************//

modules/management/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,5 +235,5 @@ resource "azurerm_virtual_machine" "mgmt_vm_instance" {
235235
disk_size_gb = module.common.disk_size
236236
}
237237

238-
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
238+
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
239239
}

modules/mds/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,5 +208,5 @@ resource "azurerm_virtual_machine" "mds_vm_instance" {
208208
disk_size_gb = module.common.disk_size
209209
}
210210

211-
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
211+
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
212212
}

modules/single-gateway/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ resource "azurerm_virtual_machine" "single_gateway_vm_instance" {
358358
disk_size_gb = module.common.disk_size
359359
}
360360

361-
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
361+
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
362362
}
363363

364364
resource "azurerm_linux_virtual_machine" "single_gateway_vm_instance_extended" {
@@ -444,5 +444,5 @@ resource "azurerm_linux_virtual_machine" "single_gateway_vm_instance_extended" {
444444
disk_size_gb = module.common.disk_size
445445
}
446446

447-
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
447+
tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
448448
}

modules/vmss/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vmss" {
490490
}
491491
}
492492

493-
tags = merge(lookup(var.tags, "virtual-machine-scale-set", {}), lookup(var.tags, "all", {}), local.vmss_tags)
493+
tags = merge(lookup(var.tags, "virtual-machine-scale-set", {}), lookup(var.tags, "all", {}), local.vmss_tags, { LegacyVMNVA = "" })
494494
}
495495

496496
resource "azurerm_monitor_autoscale_setting" "vmss_settings" {

0 commit comments

Comments
 (0)