Merge pull request #2 from kumarvna/develop

adding terraform 0.15 support

Author: kumarvna

.gitignore

@@ -4,6 +4,7 @@
 # .tfstate files
 *.tfstate
 *.tfstate.*
+*.terraform.lock.hcl
 
 # Crash log files
 crash.log

README.md

@@ -19,18 +19,22 @@ These types of resources supported:
 ```hcl
 module "virtual-machine" {
   source  = "kumarvna/virtual-machine/azurerm"
-  version = "2.0.0"
+  version = "2.1.0"
 
   # Resource Group, location, VNet and Subnet details
-  resource_group_name  = "rg-hub-demo-internal-shared-westeurope-001"
+  resource_group_name  = "rg-shared-westeurope-01"
   location             = "westeurope"
-  virtual_network_name = "vnet-default-hub-westeurope"
-  subnet_name          = "snet-management-default-hub-westeurope"
+  virtual_network_name = "vnet-shared-hub-westeurope-001"
+  subnet_name          = "snet-management"
   virtual_machine_name = "vm-linux"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
-  log_analytics_workspace_name = var.log_analytics_workspace_id
-  hub_storage_account_name     = var.hub_storage_account_id
+  log_analytics_workspace_name = var.log_analytics_workspace_name
+  hub_storage_account_name     = var.hub_storage_account_name
+
+  # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
+  # Defaults to `false` 
+  deploy_log_analytics_agent = false
 
   # This module support multiple Pre-Defined Linux and Windows Distributions.
   # Linux images: ubuntu1804, ubuntu1604, centos75, centos77, centos81, coreos
@@ -49,9 +53,12 @@ module "virtual-machine" {
   instances_count            = 2
   enable_vm_availability_set = true
 
+  # Add public IP to your VM
+  enable_public_ip_address = true
+
   # Network Seurity group port allow definitions for each Virtual Machine
   # NSG association to be added automatically for all network interfaces.
-  # SSH port 22 and 3389 is exposed to the Internet recommended for only testing.
+  # SSH port 22 and 3389 is exposed to the Internet recommended for only testing. 
   # For production environments, recommended to use a VPN or private connection.
   nsg_inbound_rules = [
     {
@@ -68,7 +75,7 @@ module "virtual-machine" {
   ]
 
   # Adding TAG's to your Azure resources (Required)
-  # ProjectName and Env are already declared above, to use them here, create a varible.
+  # ProjectName and Env are already declared above, to use them here, create a varible. 
   tags = {
     ProjectName  = "demo-internal"
     Env          = "dev"
@@ -81,9 +88,9 @@ module "virtual-machine" {
 
 ## Default Local Administrator and the Password
 
-This module utilizes __`azureadmin`__ as a local administrator on virtual machines. If you want to you use custom username, then specify the same by setting up the argument `admin_username` with valid user string.
+This module utilizes __`azureadmin`__ as a local administrator on virtual machines. If you want to you use custom username, then specify the same by setting up the argument `admin_username` with a valid user string.
 
-By default, this module generates a strong password for all virtual machines. If you want to set the custom password, specify the argument `admin_password` with valid string.
+By default, this module generates a strong password for all virtual machines also allows you to change the length of the random password (currently 24) using the `random_password_length = 32` variable. If you want to set the custom password, specify the argument `admin_password` with a valid string.
 
 This module also generates SSH2 Key pair for Linux servers by default, however, it is only recommended to use for dev environment. For production environments, please generate your own SSH2 key with a passphrase and input the key by providing the path to the argument `admin_ssh_key_data`.
 
@@ -108,7 +115,7 @@ If the pre-defined Windows or Linux variants are not sufficient then, you can sp
 ```hcl
 module "virtual-machine" {
   source  = "kumarvna/virtual-machine/azurerm"
-  version = "2.0.0"
+  version = "2.1.0"
 
   # .... omitted
 
@@ -200,7 +207,7 @@ In the Source and Destination columns, `VirtualNetwork`, `AzureLoadBalancer`, an
 ```hcl
 module "virtual-machine" {
   source  = "kumarvna/virtual-machine/azurerm"
-  version = "2.0.0"
+  version = "2.1.0"
 
   # .... omitted
   
@@ -260,7 +267,7 @@ End Date of the Project|Date when this application, workload, or service is plan
 ```hcl
 module "virtual-machine" {
   source  = "kumarvna/virtual-machine/azurerm"
-  version = "2.0.0"
+  version = "2.1.0"
 
   # Resource Group, location, VNet and Subnet details
   resource_group_name  = "rg-hub-demo-internal-shared-westeurope-001"
@@ -277,6 +284,21 @@ module "virtual-machine" {
 }
 ```
 
+## Requirements
+
+| Name | Version |
+|------|---------|
+| terraform | >= 0.13 |
+| azurerm | >= 2.59.0 |
+
+## Providers
+
+| Name | Version |
+|------|---------|
+| azurerm | >= 2.59.0 |
+| random | n/a |
+| tls | n/a |
+
 ## Inputs
 
 Name | Description | Type | Default
@@ -295,22 +317,29 @@ Name | Description | Type | Default
 `private_ip_address`|The Static IP Address which should be used. This is valid only when `private_ip_address_allocation` is set to `Static`.|string|`null`
 `dns_servers`|List of dns servers to use for network interface|string|`[]`
 `enable_vm_availability_set`|Manages an Availability Set for Virtual Machines.|string|`false`
+`platform_fault_domain_count`|Specifies the number of fault domains that are used|number|`3`
+`platform_update_domain_count`|Specifies the number of update domains that are used|number|`5`
 `enable_public_ip_address`|Reference to a Public IP Address to associate with the NIC|string|`false`
+`public_ip_allocation_method`|Defines the allocation method for this IP address. Possible values are `Static` or `Dynamic`|string|`Static`
+`public_ip_sku`|The SKU of the Public IP. Accepted values are `Basic` and `Standard`|string|`Standard`
 `source_image_id`|The ID of an Image which each Virtual Machine should be based on|string|`null`
 `custom_image`|Provide the custom image to this module if the default variants are not sufficient|map(object)|`null`
 `linux_distribution_list`|Pre-defined Azure Linux VM images list|map(object)|`ubuntu1804`
 `linux_distribution_name`|Variable to pick an OS flavor for Linux based Virtual Machine. Possible values are `centos81`, `centos77`, `centos77`, `ubuntu1804`, `ubuntu1604`, `coreos`, `mssql2019ent-rhel8`, `mssql2019std-rhel8`, `mssql2019dev-rhel8`, `mssql2019ent-ubuntu1804`, `mssql2019std-ubuntu1804`, `mssql2019dev-ubuntu1804`|string|`ubuntu1804`
 `windows_distribution_list`|Pre-defined Azure Windows VM images list|map(object)|`"windows2019dc"`
 `windows_distribution_name`|Variable to pick an OS flavor for Windows based VM. Possible values are `windows2012r2dc`, `windows2016dc`, `windows2019dc`, `windows2016dccore`, `mssql2017exp`, `mssql2017dev`, `mssql2017std`, `mssql2017ent`, `mssql2019dev`, `mssql2019std`, `mssql2019ent`, `mssql2019ent-byol`, `mssql2019std-byol`|string|`"windows2019dc"`
 `os_disk_storage_account_type`|The Type of Storage Account for Internal OS Disk. Possible values include Standard_LRS, StandardSSD_LRS and Premium_LRS.|string|`"StandardSSD_LRS"`
+`enable_ultra_ssd_data_disk_storage_support`|Should the capacity to enable Data Disks of the UltraSSD_LRS storage account type be supported on this Virtual Machine|string|`false`
 `generate_admin_ssh_key`|Generates a secure private key and encodes it as PEM|string|`true`
 `admin_ssh_key_data`|specify the path to the existing SSH key to authenticate Linux virtual machine|string|`""`
 `admin_username`|The username of the local administrator used for the Virtual Machine|string|`"azureadmin"`
 `admin_password`|The Password which should be used for the local-administrator on this Virtual Machine|string|`null`
+`random_password_length`|The desired length of random password created by this module|number|`24`
 `disable_password_authentication`|Should Password Authentication be disabled on this Virtual Machine. Applicable to Linux Virtual machine|string|`true`
 `nsg_inbound_rules`|List of network rules to apply to network interface|object|`{}`
 `dedicated_host_id`|The ID of a Dedicated Host where this machine should be run on|string|`null`
 `license_type`|Specifies the type of on-premise license which should be used for this Virtual Machine. Possible values are `None`, `Windows_Client` and `Windows_Server`.|string|`"None"`
+`vm_time_zone`|Specifies the Time Zone which should be used by the Virtual Machine. Ex. `"UTC"` or `"W. Europe Standard Time"` [The possible values are defined here](https://jackstromberg.com/2017/01/list-of-time-zones-consumed-by-azure/) |string|`null`
 `Tags`|A map of tags to add to all resources|map|`{}`
 
 ## Outputs
@@ -335,7 +364,7 @@ Name | Description | Type | Default
 
 ## Authors
 
-Module is maintained by [Kumaraswamy Vithanala](mailto:[email protected]) with the help from other awesome contributors.
+Originally created by [Kumaraswamy Vithanala](mailto:[email protected]).
 
 ## Other resources
 

examples/README.md

@@ -9,18 +9,22 @@ This terraform module is designed to deploy azure Windows or Linux virtual machi
 ```hcl
 module "virtual-machine" {
   source  = "kumarvna/virtual-machine/azurerm"
-  version = "2.0.0"
+  version = "2.1.0"
 
   # Resource Group, location, VNet and Subnet details
-  resource_group_name  = "rg-hub-demo-internal-shared-westeurope-001"
+  resource_group_name  = "rg-shared-westeurope-01"
   location             = "westeurope"
-  virtual_network_name = "vnet-default-hub-westeurope"
-  subnet_name          = "snet-management-default-hub-westeurope"
+  virtual_network_name = "vnet-shared-hub-westeurope-001"
+  subnet_name          = "snet-management"
   virtual_machine_name = "vm-linux"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
-  log_analytics_workspace_name = var.log_analytics_workspace_id
-  hub_storage_account_name     = var.hub_storage_account_id
+  log_analytics_workspace_name = var.log_analytics_workspace_name
+  hub_storage_account_name     = var.hub_storage_account_name
+
+  # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
+  # Defaults to `false` 
+  deploy_log_analytics_agent = false
 
   # This module support multiple Pre-Defined Linux and Windows Distributions.
   # Linux images: ubuntu1804, ubuntu1604, centos75, centos77, centos81, coreos
@@ -39,9 +43,12 @@ module "virtual-machine" {
   instances_count            = 2
   enable_vm_availability_set = true
 
+  # Add public IP to your VM
+  enable_public_ip_address = true
+
   # Network Seurity group port allow definitions for each Virtual Machine
   # NSG association to be added automatically for all network interfaces.
-  # SSH port 22 and 3389 is exposed to the Internet recommended for only testing.
+  # SSH port 22 and 3389 is exposed to the Internet recommended for only testing. 
   # For production environments, recommended to use a VPN or private connection.
   nsg_inbound_rules = [
     {
@@ -58,7 +65,7 @@ module "virtual-machine" {
   ]
 
   # Adding TAG's to your Azure resources (Required)
-  # ProjectName and Env are already declared above, to use them here, create a varible.
+  # ProjectName and Env are already declared above, to use them here, create a varible. 
   tags = {
     ProjectName  = "demo-internal"
     Env          = "dev"
@@ -74,18 +81,22 @@ module "virtual-machine" {
 ```hcl
 module "virtual-machine" {
   source  = "kumarvna/virtual-machine/azurerm"
-  version = "2.0.0"
+  version = "2.1.0"
 
   # Resource Group, location, VNet and Subnet details
-  resource_group_name  = "rg-hub-demo-internal-shared-westeurope-001"
+  resource_group_name  = "rg-shared-westeurope-01"
   location             = "westeurope"
-  virtual_network_name = "vnet-default-hub-westeurope"
-  subnet_name          = "snet-management-default-hub-westeurope"
-  virtual_machine_name = "vm-linux"
+  virtual_network_name = "vnet-shared-hub-westeurope-001"
+  subnet_name          = "snet-management"
+  virtual_machine_name = "win-machine"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
-  log_analytics_workspace_name = var.log_analytics_workspace_id
-  hub_storage_account_name     = var.hub_storage_account_id
+  log_analytics_workspace_name = var.log_analytics_workspace_name
+  hub_storage_account_name     = var.hub_storage_account_name
+
+  # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
+  # Defaults to `false` 
+  deploy_log_analytics_agent = false
 
   # This module support multiple Pre-Defined Linux and Windows Distributions.
   # Linux images: ubuntu1804, ubuntu1604, centos75, centos77, centos81, coreos
@@ -103,11 +114,13 @@ module "virtual-machine" {
   admin_password             = "P@$$w0rd1234!"
   instances_count            = 2
   enable_vm_availability_set = true
-  enable_public_ip_address   = true
+
+  # Add public IP to your VM
+  enable_public_ip_address = true
 
   # Network Seurity group port allow definitions for each Virtual Machine
   # NSG association to be added automatically for all network interfaces.
-  # SSH port 22 and 3389 is exposed to the Internet recommended for only testing.
+  # SSH port 22 and 3389 is exposed to the Internet recommended for only testing. 
   # For production environments, recommended to use a VPN or private connection.
   nsg_inbound_rules = [
     {
@@ -124,7 +137,7 @@ module "virtual-machine" {
   ]
 
   # Adding TAG's to your Azure resources (Required)
-  # ProjectName and Env are already declared above, to use them here, create a varible.
+  # ProjectName and Env are already declared above, to use them here, create a varible. 
   tags = {
     ProjectName  = "demo-internal"
     Env          = "dev"
@@ -140,18 +153,23 @@ module "virtual-machine" {
 ```hcl
 module "virtual-machine" {
   source  = "kumarvna/virtual-machine/azurerm"
-  version = "2.0.0"
+  version = "2.1.0"
+
 
   # Resource Group, location, VNet and Subnet details
-  resource_group_name  = "rg-hub-demo-internal-shared-westeurope-001"
+  resource_group_name  = "rg-shared-westeurope-01"
   location             = "westeurope"
-  virtual_network_name = "vnet-default-hub-westeurope"
-  subnet_name          = "snet-management-default-hub-westeurope"
-  virtual_machine_name = "vm-linux"
+  virtual_network_name = "vnet-shared-hub-westeurope-001"
+  subnet_name          = "snet-management"
+  virtual_machine_name = "win-sqlvm"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
-  log_analytics_workspace_name = var.log_analytics_workspace_id
-  hub_storage_account_name     = var.hub_storage_account_id
+  log_analytics_workspace_name = var.log_analytics_workspace_name
+  hub_storage_account_name     = var.hub_storage_account_name
+
+  # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
+  # Defaults to `false` 
+  deploy_log_analytics_agent = false
 
   # This module support multiple Pre-Defined Linux and Windows Distributions.
   # Linux images: ubuntu1804, ubuntu1604, centos75, centos77, centos81, coreos
@@ -163,16 +181,19 @@ module "virtual-machine" {
   # Ubuntu images: mssql2019ent-ubuntu1804, mssql2019std-ubuntu1804, mssql2019dev-ubuntu1804
   # Bring your own License (BOYL) images: mssql2019ent-byol, mssql2019std-byol
   os_flavor                  = "windows"
-  windows_distribution_name  = "mssql2017std"
+  windows_distribution_name  = "mssql2019std"
   virtual_machine_size       = "Standard_A2_v2"
   admin_username             = "azureadmin"
-  admin_password             = "complex_password"
+  admin_password             = "P@$$w0rd1234!"
   instances_count            = 2
   enable_vm_availability_set = true
 
+  # Add public IP to your VM
+  enable_public_ip_address = true
+
   # Network Seurity group port allow definitions for each Virtual Machine
   # NSG association to be added automatically for all network interfaces.
-  # SSH port 22 and 3389 is exposed to the Internet recommended for only testing.
+  # SSH port 22 and 3389 is exposed to the Internet recommended for only testing. 
   # For production environments, recommended to use a VPN or private connection.
   nsg_inbound_rules = [
     {
@@ -189,7 +210,7 @@ module "virtual-machine" {
   ]
 
   # Adding TAG's to your Azure resources (Required)
-  # ProjectName and Env are already declared above, to use them here, create a varible.
+  # ProjectName and Env are already declared above, to use them here, create a varible. 
   tags = {
     ProjectName  = "demo-internal"
     Env          = "dev"

examples/linux_virtual_machine/README.md

@@ -7,18 +7,22 @@ This terraform module is designed to deploy azure Linux virtual machines with Pu
 ```hcl
 module "virtual-machine" {
   source  = "kumarvna/virtual-machine/azurerm"
-  version = "2.0.0"
+  version = "2.1.0"
 
   # Resource Group, location, VNet and Subnet details
-  resource_group_name  = "rg-hub-demo-internal-shared-westeurope-001"
+  resource_group_name  = "rg-shared-westeurope-01"
   location             = "westeurope"
-  virtual_network_name = "vnet-default-hub-westeurope"
-  subnet_name          = "snet-management-default-hub-westeurope"
+  virtual_network_name = "vnet-shared-hub-westeurope-001"
+  subnet_name          = "snet-management"
   virtual_machine_name = "vm-linux"
 
   # (Optional) To enable Azure Monitoring and install log analytics agents
-  log_analytics_workspace_name = var.log_analytics_workspace_id
-  hub_storage_account_name     = var.hub_storage_account_id
+  log_analytics_workspace_name = var.log_analytics_workspace_name
+  hub_storage_account_name     = var.hub_storage_account_name
+
+  # Deploy log analytics agents to virtual machine. Log analytics workspace name required.
+  # Defaults to `false` 
+  deploy_log_analytics_agent = false
 
   # This module support multiple Pre-Defined Linux and Windows Distributions.
   # Linux images: ubuntu1804, ubuntu1604, centos75, centos77, centos81, coreos
@@ -37,9 +41,12 @@ module "virtual-machine" {
   instances_count            = 2
   enable_vm_availability_set = true
 
+  # Add public IP to your VM
+  enable_public_ip_address = true
+
   # Network Seurity group port allow definitions for each Virtual Machine
   # NSG association to be added automatically for all network interfaces.
-  # SSH port 22 and 3389 is exposed to the Internet recommended for only testing.
+  # SSH port 22 and 3389 is exposed to the Internet recommended for only testing. 
   # For production environments, recommended to use a VPN or private connection.
   nsg_inbound_rules = [
     {
@@ -56,7 +63,7 @@ module "virtual-machine" {
   ]
 
   # Adding TAG's to your Azure resources (Required)
-  # ProjectName and Env are already declared above, to use them here, create a varible.
+  # ProjectName and Env are already declared above, to use them here, create a varible. 
   tags = {
     ProjectName  = "demo-internal"
     Env          = "dev"