Disk name validation and other features

CHANGELOG.md

@@ -1,30 +1,51 @@
 # Changelog
-All notable changes to this module will be documented in this file.
-
+
+All notable changes to this module will be documented in this file. 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this module adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
- 
+
 ## [Unreleased]
 
+## [5.0.0] - 2024-08-30
+
+Added new features, variable change name and disk name validation.
+
+### Added
+
+Support:
+
+- Support multiples network interfaces (NICs).
+- NICs accelearate networking.
+- Proximity placement group.
+- Source resource ID for disk when create from copy or recovery.
+- Disk validation of Logical Name can't contain a '-'
+
+### Changed
+
+- Variable name for os disk write_accelerator_enabled.
+
 ## [4.1.0] - 2024-05-07
 
 ### Added
+
 - Set tags at all resources created in this repository that support tags
 - Output of the created network interface
 
 ### Removed
+
 - removed "ignore changes" for tags
 
 ## [4.0.0] - 2024-03-18
 
 ### Added
 
-### Changed 
+### Changed
+
 - fixed README title
 
 ### Removed
-- removed old mma 
 
+- removed old mma
 
 ## [3.0.0] - 2024-02-08
 
@@ -33,13 +54,18 @@ and this module adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.
 Please note, that this upgrade makes the above properties managed by terraform. Therefore outside changes will be reverted by terraform from now on.
 
 To upgrade to this new major version from `2.x` without changes to VMs (and therefore not supporting Update Manager) do:
+
 1. Set variables
-  - `patch_assessment_mode="ImageDefault"`
-  - `patch_mode="AutomaticByOS"`
-  - `bypass_platform_safety_checks_on_user_schedule_enabled=false`
-  - `severity_group=""` if not already set
-2. Run `terraform plan` and check if the values of the VM planned to change
-  - If the values of the properties are planned to change, use actual values instead of the above
+
+    - `patch_assessment_mode="ImageDefault"`
+    - `patch_mode="AutomaticByOS"`
+    - `bypass_platform_safety_checks_on_user_schedule_enabled=false`
+    - `severity_group=""` if not already set
+
+1. Run `terraform plan` and check if the values of the VM planned to change
+
+
+    - If the values of the properties are planned to change, use actual values instead of the above
 
 ### Added
 
@@ -75,15 +101,15 @@ Apply a default naming convention for disks. To upgrade to the new version from
 - allow override of OsDisk and Data Disk names
 
 ## [1.1.1] - 2023-10-17
- 
+
 ### Added
- 
+
 ### Changed
- 
+
 ### Removed
 
- - removed ignore_changes for tags in the windows virtual machine resource
+- removed ignore_changes for tags in the windows virtual machine resource
 
 ### Fixed
 
- - you can now add tags also after initial deployment, they are not ignored anymore
+- you can now add tags also after initial deployment, they are not ignored anymore

data_disk.tf

@@ -1,12 +1,15 @@
 resource "azurerm_managed_disk" "data_disk" {
-  for_each             = var.data_disks
-  name                 = lookup(var.name_overrides.data_disks, each.key, "disk-${var.virtual_machine_config.hostname}-${each.key}")
-  location             = var.virtual_machine_config.location
-  resource_group_name  = var.resource_group_name
-  storage_account_type = each.value["storage_account_type"]
-  create_option        = each.value["create_option"]
-  disk_size_gb         = each.value["disk_size_gb"]
-  zone                 = var.virtual_machine_config.zone
+  for_each                   = var.data_disks
+  name                       = lookup(var.name_overrides.data_disks, each.key, "disk-${var.virtual_machine_config.hostname}-${each.key}")
+  location                   = var.virtual_machine_config.location
+  resource_group_name        = var.resource_group_name
+  zone                       = var.virtual_machine_config.zone
+  storage_account_type       = each.value["storage_account_type"]
+  create_option              = each.value["create_option"]
+  source_resource_id         = each.value["source_resource_id"]
+  disk_size_gb               = each.value["disk_size_gb"]
+  on_demand_bursting_enabled = each.value["on_demand_bursting_enabled"]
+
   tags                 = var.tags
   lifecycle {
     prevent_destroy = true
@@ -24,4 +27,4 @@ resource "azurerm_virtual_machine_data_disk_attachment" "data_disk" {
   lifecycle {
     prevent_destroy = true
   }
-}
+}

examples/advanced/locals.tf

@@ -1,15 +1,15 @@
 locals {
-  location = "West Europe"
-  resource_group_name = "rg-examples_vm_deploy-02"
-  virtual_network_name = "vnet-examples_vm_deploy-02"
-  subnet_name = "snet-examples_vm_deploy-02"
-  availability_set_name = "as-examples_vm_deploy-02"
-  managed_disk_name = "disk-examples_vm_deploy-02"
-  nsg_name = "nsg-examples_vm_deploy-02"
-  law_name = "law-examplesvmdeploy-02"
+  location                       = "West Europe"
+  resource_group_name            = "rg-examples_vm_deploy-02"
+  virtual_network_name           = "vnet-examples_vm_deploy-02"
+  subnet_name                    = "snet-examples_vm_deploy-02"
+  availability_set_name          = "as-examples_vm_deploy-02"
+  proximity_placement_group_name = "ppg-examples_vm_deploy-02"
+  managed_disk_name              = "examples_vm_deploy02"
+  nsg_name                       = "nsg-examples_vm_deploy-02"
 
-  nic = "nic-examples_vm_deploy-02"
-  nic_ip_config = "nic-ip-examples_vm_deploy-02"
-  public_ip = "pip-examples_vm_deploy-02"
+  nic             = "nic-examples_vm_deploy-02"
+  nic_ip_config   = "nic-ip-examples_vm_deploy-02"
+  public_ip       = "pip-examples_vm_deploy-02"
   virtual_machine = "vm-examples_vm_deploy-02"
 }

examples/advanced/main.tf

@@ -9,24 +9,36 @@ module "virtual_machine" {
     allocation_method = "Static"
   }
   nic_config = {
-    private_ip  = "10.0.0.16"
-    dns_servers = ["10.0.0.10", "10.0.0.11"]
-    nsg         = azurerm_network_security_group.this
+    private_ip                    = "10.0.0.16"
+    dns_servers                   = ["10.0.0.10", "10.0.0.11"]
+    enable_accelerated_networking = true
+    nsg                           = azurerm_network_security_group.this
   }
   virtual_machine_config = {
-    hostname                  = "CUSTAPP007"
-    size                      = "Standard_B1s"
-    os_sku                    = "2022-datacenter-g2"
-    location                  = azurerm_resource_group.this.location
-    availability_set_id       = azurerm_availability_set.this.id
-    os_version                = "latest"
-    admin_username            = "loc_admin"
-    os_disk_caching           = "ReadWrite"
-    os_disk_storage_type      = "Standard_LRS"
-    os_disk_size_gb           = 128
-    os_disk_name              = "DiskOverride"
-    timezone                  = "Azores Standard Time"
-    write_accelerator_enabled = false
+    hostname                     = "CUSTAPP007"
+    location                     = azurerm_resource_group.this.location
+    size                         = "Standard_B1s"
+    os_sku                       = "2022-datacenter-g2"
+    os_version                   = "latest"
+    os_disk_name                 = "DiskOverride"
+    os_disk_size_gb              = 128
+    os_disk_caching              = "ReadWrite"
+    os_disk_storage_type         = "Standard_LRS"
+    os_disk_write_accelerator_enabled = false
+    availability_set_id          = azurerm_availability_set.this.id
+    proximity_placement_group_id = azurerm_proximity_placement_group.this.id
+
+    admin_username               = "loc_admin"
+
+    timezone                     = "Azores Standard Time"
+
+    patch_assessment_mode                                  = "AutomaticByPlatform"
+    patch_mode                                             = "AutomaticByPlatform"
+    bypass_platform_safety_checks_on_user_schedule_enabled = true
+
+    tags = {
+      "Environment" = "prd"
+    }
   }
   admin_password      = "H3ll0W0rld!"
   resource_group_name = azurerm_resource_group.this.name
@@ -41,9 +53,10 @@ module "virtual_machine" {
       write_accelerator_enabled = false
     }
   }
-  tags = {
-    "example" = "examplevalue"
-  }
+
+  additional_network_interface_ids = [azurerm_network_interface.additional_nic_01.id]
+  severity_group                   = "01-third-tuesday-0200-XCSUFEDTG-reboot"
+  update_allowed                   = true
 
   name_overrides = {
     nic             = local.nic
@@ -54,7 +67,10 @@ module "virtual_machine" {
       "${local.managed_disk_name}" = "Override"
     }
   }
-  severity_group = "01-first-monday-2000-csu-reboot"
+
+  tags = {
+    "example" = "examplevalue"
+  }
 }
 
 resource "azurerm_resource_group" "this" {
@@ -77,9 +93,41 @@ resource "azurerm_subnet" "this" {
 }
 
 resource "azurerm_availability_set" "this" {
-  name                = local.availability_set_name
+  name                         = local.availability_set_name
+  location                     = local.location
+  resource_group_name          = azurerm_resource_group.this.name
+  proximity_placement_group_id = azurerm_proximity_placement_group.this.id
+}
+
+resource "azurerm_proximity_placement_group" "this" {
+  name                = local.proximity_placement_group_name
   location            = local.location
   resource_group_name = azurerm_resource_group.this.name
+
+  lifecycle {
+      ignore_changes = [tags]
+  }
+}
+
+resource "azurerm_network_interface" "additional_nic_01" {
+  name                          = "nic-vm-${replace(element(azurerm_virtual_network.this.address_space,0), "/[./]/", "-")}-01"
+  location                      = local.location
+  resource_group_name           = azurerm_resource_group.this.name
+  dns_servers                   = []
+
+  ip_configuration {
+    name                          = "ip-nic-01"
+    subnet_id                     = azurerm_subnet.this.id
+    private_ip_address_allocation = "Dynamic"
+    private_ip_address            = null
+    public_ip_address_id          = null
+  }
+
+  lifecycle {
+    ignore_changes = [
+      tags
+    ]
+  }
 }
 
 resource "azurerm_network_security_group" "this" {
@@ -99,5 +147,3 @@ resource "azurerm_network_security_group" "this" {
     destination_address_prefix = "*"
   }
 }
-
-

locals.tf

@@ -14,5 +14,4 @@ locals {
   }
   os_disk_name   = coalesce(var.name_overrides.os_disk, "disk-${var.virtual_machine_config.hostname}-Os")
   update_allowed = var.update_allowed ? "yes" : "no"
-}
-
+}

main.tf

@@ -9,10 +9,11 @@ resource "azurerm_public_ip" "this" {
 }
 
 resource "azurerm_network_interface" "this" {
-  name                = local.nic.name
-  location            = var.virtual_machine_config.location
-  resource_group_name = var.resource_group_name
-  dns_servers         = var.nic_config.dns_servers
+  name                           = local.nic.name
+  location                       = var.virtual_machine_config.location
+  resource_group_name            = var.resource_group_name
+  dns_servers                    = var.nic_config.dns_servers
+  accelerated_networking_enabled = var.nic_config.enable_accelerated_networking
 
   ip_configuration {
     name                          = local.nic.ip_config_name
@@ -40,9 +41,6 @@ resource "azurerm_windows_virtual_machine" "this" {
   provision_vm_agent  = true
   admin_username      = var.virtual_machine_config.admin_username
   admin_password      = var.admin_password
-  network_interface_ids = [
-    azurerm_network_interface.this.id,
-  ]
 
   os_disk {
     name                 = local.os_disk_name
@@ -58,12 +56,14 @@ resource "azurerm_windows_virtual_machine" "this" {
     version   = var.virtual_machine_config.os_version
   }
 
-  availability_set_id = var.virtual_machine_config.availability_set_id
-  zone                = var.virtual_machine_config.zone
-  tags                = local.virtual_machine.tags
-  timezone            = var.virtual_machine_config.timezone
-  patch_mode          = var.virtual_machine_config.patch_mode
-  patch_assessment_mode = var.virtual_machine_config.patch_assessment_mode
+  proximity_placement_group_id = var.virtual_machine_config.proximity_placement_group_id
+  network_interface_ids        = concat([azurerm_network_interface.this.id], var.additional_network_interface_ids)
+  availability_set_id          = var.virtual_machine_config.availability_set_id
+  zone                         = var.virtual_machine_config.zone
+  tags                         = local.virtual_machine.tags
+  timezone                     = var.virtual_machine_config.timezone
+  patch_mode                   = var.virtual_machine_config.patch_mode
+  patch_assessment_mode        = var.virtual_machine_config.patch_assessment_mode
   bypass_platform_safety_checks_on_user_schedule_enabled = var.virtual_machine_config.bypass_platform_safety_checks_on_user_schedule_enabled
 
   lifecycle {