Skip to content
Open
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
1 change: 1 addition & 0 deletions .gitleaksignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SEE: https://github.com/gitleaks/gitleaks/blob/master/README.md#gitleaksignore

cd9c0efec38c5d63053dd865e5d4e207c0760d91:docs/guides/Perform_static_analysis.md:generic-api-key:37
fd71f4dcbbb6cb4957775afc718fb957fe8e9deb:scripts/golden-image/aib-template.json:ipv4:3
2 changes: 1 addition & 1 deletion infrastructure/environments/production.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ environment = "PROD"
env_type = "live"

# See variable description
virtual_desktop_group_active = "blue"
virtual_desktop_group_active = "green"

attached_environments = ["pre", "prd"]

Expand Down
4 changes: 2 additions & 2 deletions infrastructure/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,8 @@ variable "virtual_desktop_group_active" {
This can either be 'blue', 'green', 'both-with-blue-primary', 'both-with-green-primary', 'both-with-blue-primary-but-equal-vms' or 'both-with-green-primary-but-equal-vms'.
blue means only virtual desktop blue is deployed whilst virtual desktop green is removed.
green means only virtual desktop green is deployed whilst virtual desktop blue is removed. Users are directed to group green.
both-blue-primary means both virtual desktop groups are deployed, but ONLY the platform users can see group green. All other users will be directed to group blue.
both-green-primary means both virtual desktop groups are deployed, but ONLY the platform users can see group blue. All other users will be directed to group green.
both-with-blue-primary means both virtual desktop groups are deployed, but ONLY the platform users can see group green. All other users will be directed to group blue.
both-with-green-primary means both virtual desktop groups are deployed, but ONLY the platform users can see group blue. All other users will be directed to group green.
both-with-blue-primary-but-equal-vms means both virtual desktop groups are deployed with equal VM counts, but ONLY the platform users can see group green. All other users will be directed to group blue.
both-with-green-primary-but-equal-vms means both virtual desktop groups are deployed with equal VM counts, but ONLY the platform users can see group blue. All other users will be directed to group green.

Expand Down
4 changes: 2 additions & 2 deletions infrastructure/virtual_desktop.tf
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,9 @@ module "virtual-desktop-v2" {
resource_group_name = azurerm_resource_group.avd-v2[each.key].name
resource_group_id = azurerm_resource_group.avd-v2[each.key].id
scaling_plan_name = module.config[each.key].names.avd-scaling-plan
source_image_id = null
source_image_id = var.AVD_SOURCE_IMAGE_ID
source_image_reference = null
source_image_from_gallery = var.avd_source_image_from_gallery
source_image_from_gallery = null
subnet_id = module.subnets_hub["${module.config[each.key].names.subnet}-virtual-desktop"].id
vm_count = local.green_avd_primary || local.equal_vm_counts ? var.avd_vm_count : 1
vm_name_prefix = "${module.config[each.key].names.avd-host}"
Expand Down