Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions modules/azurerm/Compute-Image/compute_image.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
# --------------------------------------------------------------------------------------

resource "azurerm_shared_image" "compute_image" {
name = join("-", [var.shared_image_abbreviation, var.name])
gallery_name = var.gallery_name
resource_group_name = var.resource_group
location = var.location
os_type = var.shared_image_os_type
hyper_v_generation = var.hyper_v_generation
name = join("-", [var.shared_image_abbreviation, var.name])
gallery_name = var.gallery_name
resource_group_name = var.resource_group
location = var.location
os_type = var.shared_image_os_type
hyper_v_generation = var.hyper_v_generation
trusted_launch_supported = var.trusted_launch_supported
trusted_launch_enabled = var.trusted_launch_enabled

identifier {
publisher = var.shared_image_publisher
Expand Down
12 changes: 12 additions & 0 deletions modules/azurerm/Compute-Image/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,15 @@ variable "shared_image_abbreviation" {
type = string
default = "si"
}

variable "trusted_launch_supported" {
description = "Specifies whether Trusted Launch is supported for the Shared Image."
type = bool
default = null
}

variable "trusted_launch_enabled" {
description = "Specifies whether Trusted Launch is enabled for the Shared Image."
type = bool
default = null
}
2 changes: 1 addition & 1 deletion modules/azurerm/Firewall/output.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ output "firewall_public_ip_names" {
}

output "firewall_public_ip_associations" {
value = {for pip in azurerm_public_ip.firewall_public_ip : pip.name => pip.ip_address}
value = { for pip in azurerm_public_ip.firewall_public_ip : pip.name => pip.ip_address }
depends_on = [azurerm_public_ip.firewall_public_ip]
}
8 changes: 4 additions & 4 deletions modules/azurerm/Storage-Account-Static-Website-CDN/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,20 @@ output "storage_account_secondary_web_endpoint" {

output "cdn_profile_name" {
depends_on = [azurerm_cdn_profile.cdn_profile]
value = azurerm_cdn_profile.cdn_profile.name
value = azurerm_cdn_profile.cdn_profile.name
}

output "cdn_profile_id" {
depends_on = [azurerm_cdn_profile.cdn_profile]
value = azurerm_cdn_profile.cdn_profile.id
value = azurerm_cdn_profile.cdn_profile.id
}

output "cdn_endpoint_fqdn" {
depends_on = [azurerm_cdn_endpoint.cdn_endpoint]
value = azurerm_cdn_endpoint.cdn_endpoint.fqdn
value = azurerm_cdn_endpoint.cdn_endpoint.fqdn
}

output "cdn_endpoint_id" {
depends_on = [azurerm_cdn_endpoint.cdn_endpoint]
value = azurerm_cdn_endpoint.cdn_endpoint.id
value = azurerm_cdn_endpoint.cdn_endpoint.id
}