Skip to content

Commit dc5c09c

Browse files
authored
Merge pull request #11 from kumarvna/develop
updating the documentation #10
2 parents f3c706b + 9096b82 commit dc5c09c

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ Name | Description | Type | Default
414414
`dns_servers`|List of dns servers to use for network interface|string|`[]`
415415
`enable_ip_forwarding`|Should IP Forwarding be enabled?|string|`false`
416416
`enable_accelerated_networking`|Should Accelerated Networking be enabled?|string|`false`
417-
`private_ip_address_allocation_type`|The allocation method used for the Private IP Address. Possible values are Dynamic and Static.|string|`false`
417+
`private_ip_address_allocation_type`|The allocation method used for the Private IP Address. Possible values are Dynamic and Static.|string|`Dynamic`
418418
`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`
419419
`enable_vm_availability_set`|Manages an Availability Set for Virtual Machines.|string|`false`
420420
`platform_fault_domain_count`|Specifies the number of fault domains that are used|number|`3`
@@ -433,7 +433,7 @@ Name | Description | Type | Default
433433
`dedicated_host_id`|The ID of a Dedicated Host where this machine should be run on|string|`null`
434434
`custom_data`|Base64 encoded file of a bash script that gets run once by cloud-init upon VM creation|string|`null`
435435
`enable_automatic_updates`|Specifies if Automatic Updates are Enabled for the Windows Virtual Machine|string|`false`
436-
`enable_encryption_at_host`|Should all of the disks (including the temp disk) attached to this Virtual Machine be encrypted by enabling Encryption at Host?|string|false
436+
`enable_encryption_at_host`|Should all of the disks (including the temp disk) attached to this Virtual Machine be encrypted by enabling Encryption at Host?|string|`false`
437437
`vm_availability_zone`|The Zone in which this Virtual Machine should be created. Conflicts with availability set and shouldn't use both.|string|`null`
438438
`patch_mode`|Specifies the mode of in-guest patching to this Windows Virtual Machine. Possible values are `Manual`, `AutomaticByOS` and `AutomaticByPlatform`|string|`"AutomaticByOS"`
439439
`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"`
@@ -458,12 +458,15 @@ Name | Description | Type | Default
458458
`key_vault_certificate_secret_url`|The Secret URL of a Key Vault Certificate, which must be specified when `protocol` is set to `Https`|string|`null`
459459
`additional_unattend_content`|The XML formatted content that is added to the unattend.xml file for the specified path and component|string|`null`
460460
`additional_unattend_content_setting`|The name of the setting to which the content applies. Possible values are `AutoLogon` and `FirstLogonCommands`|string|`null`
461-
`enable_boot_diagnostics`|Should the boot diagnostics enabled?|string|false
461+
`enable_boot_diagnostics`|Should the boot diagnostics enabled?|string|`false`
462462
`storage_account_uri`|The Primary/Secondary Endpoint for the Azure Storage Account which should be used to store Boot Diagnostics, including Console Output and Screenshots from the Hypervisor. Passing a `null` value will utilize a Managed Storage Account to store Boot Diagnostics|string|`null`
463463
`data_disks`|Managed Data Disks for azure viratual machine|list|`[]`
464-
`log_analytics_workspace_name`|The name of log analytics workspace name|string|`null`
465464
`storage_account_name`|The name of the storage account name|string|`null`
466465
`deploy_log_analytics_agent`|Install log analytics agent to windows or linux VM|string|`false`
466+
`log_analytics_workspace_id`|The name of log analytics workspace resource id|string|`null`
467+
`log_analytics_customer_id`|The Workspace (or Customer) ID for the Log Analytics Workspace|string|`null`
468+
`log_analytics_workspace_primary_shared_key`|The Primary shared key for the Log Analytics Workspace|string|`null`
469+
`intall_iis_server_on_instances`|Install ISS server on every Instance in the VM scale set|string|`false`
467470
`Tags`|A map of tags to add to all resources|map|`{}`
468471

469472
## Outputs

graph.png

-6.6 KB
Loading

output.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ output "admin_ssh_key_private" {
1212
output "windows_vm_password" {
1313
description = "Password for the windows VM"
1414
sensitive = true
15-
value = var.os_flavor == "windows" ? element(concat(random_password.passwd.*.result, [""]), 0) : null
15+
value = var.admin_password == null ? element(concat(random_password.passwd.*.result, [""]), 0) : var.admin_password
1616
}
1717

1818
output "linux_vm_password" {
1919
description = "Password for the Linux VM"
2020
sensitive = true
21-
value = var.os_flavor == "linux" && var.disable_password_authentication != true && var.admin_password == null ? element(concat(random_password.passwd.*.result, [""]), 0) : null
21+
value = var.disable_password_authentication == false && var.admin_password == null ? element(concat(random_password.passwd.*.result, [""]), 0) : var.admin_password
2222
}
2323

2424
output "windows_vm_public_ips" {
@@ -53,7 +53,7 @@ output "windows_virtual_machine_ids" {
5353

5454
output "network_security_group_ids" {
5555
description = "List of Network security groups and ids"
56-
value = azurerm_network_security_group.nsg.*.id
56+
value = var.existing_network_security_group_id == null ? azurerm_network_security_group.nsg.*.id : null
5757
}
5858

5959
output "vm_availability_set_id" {

0 commit comments

Comments
 (0)