From 88dab1cae1799ddc4b10b34fa3caba2b9fe76a35 Mon Sep 17 00:00:00 2001
From: noamerez <noamerez@checkpoint.com>
Date: Thu, 28 May 2026 15:40:45 +0000
Subject: [PATCH] feat(CGNSPC-2249): Azure | Add LegacyVMNVA tag to disable
 MANA

---
 modules/high-availability/main.tf | 6 +++---
 modules/management/main.tf        | 2 +-
 modules/mds/main.tf               | 2 +-
 modules/single-gateway/main.tf    | 4 ++--
 modules/vmss/main.tf              | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/high-availability/main.tf b/modules/high-availability/main.tf
index 4873cb8..217c38c 100644
--- a/modules/high-availability/main.tf
+++ b/modules/high-availability/main.tf
@@ -455,7 +455,7 @@ resource "azurerm_virtual_machine" "vm_instance_availability_set" {
     storage_uri = module.vm_boot_diagnostics_storage.storage_account_primary_blob_endpoint
   }
 
-  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
+  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
 }
 
 resource "azurerm_virtual_machine" "vm_instance_availability_zone" {
@@ -552,7 +552,7 @@ resource "azurerm_virtual_machine" "vm_instance_availability_zone" {
     storage_uri = module.vm_boot_diagnostics_storage.storage_account_primary_blob_endpoint
   }
 
-  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
+  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
 }
 
 resource "azurerm_linux_virtual_machine" "vm_instance_availability_zone_extended" {
@@ -651,7 +651,7 @@ resource "azurerm_linux_virtual_machine" "vm_instance_availability_zone_extended
     }
   }
 
-  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
+  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
 }
 
 //********************** Role Assigments **************************//
diff --git a/modules/management/main.tf b/modules/management/main.tf
index 4879822..d3320b3 100644
--- a/modules/management/main.tf
+++ b/modules/management/main.tf
@@ -235,5 +235,5 @@ resource "azurerm_virtual_machine" "mgmt_vm_instance" {
     disk_size_gb      = module.common.disk_size
   }
 
-  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
+  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
 }
diff --git a/modules/mds/main.tf b/modules/mds/main.tf
index 5c3b9eb..3b7c212 100644
--- a/modules/mds/main.tf
+++ b/modules/mds/main.tf
@@ -208,5 +208,5 @@ resource "azurerm_virtual_machine" "mds_vm_instance" {
     disk_size_gb      = module.common.disk_size
   }
 
-  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
+  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
 }
diff --git a/modules/single-gateway/main.tf b/modules/single-gateway/main.tf
index ab452bd..c2e704c 100644
--- a/modules/single-gateway/main.tf
+++ b/modules/single-gateway/main.tf
@@ -358,7 +358,7 @@ resource "azurerm_virtual_machine" "single_gateway_vm_instance" {
     disk_size_gb      = module.common.disk_size
   }
 
-  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
+  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
 }
 
 resource "azurerm_linux_virtual_machine" "single_gateway_vm_instance_extended" {
@@ -444,5 +444,5 @@ resource "azurerm_linux_virtual_machine" "single_gateway_vm_instance_extended" {
     disk_size_gb         = module.common.disk_size
   }
 
-  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}))
+  tags = merge(lookup(var.tags, "virtual-machine", {}), lookup(var.tags, "all", {}), { LegacyVMNVA = "" })
 }
diff --git a/modules/vmss/main.tf b/modules/vmss/main.tf
index 076e770..0b93be6 100644
--- a/modules/vmss/main.tf
+++ b/modules/vmss/main.tf
@@ -490,7 +490,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "vmss" {
     }
   }
 
-  tags = merge(lookup(var.tags, "virtual-machine-scale-set", {}), lookup(var.tags, "all", {}), local.vmss_tags)
+  tags = merge(lookup(var.tags, "virtual-machine-scale-set", {}), lookup(var.tags, "all", {}), local.vmss_tags, { LegacyVMNVA = "" })
 }
 
 resource "azurerm_monitor_autoscale_setting" "vmss_settings" {