Skip to content
This repository was archived by the owner on Jul 26, 2024. It is now read-only.
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
2 changes: 1 addition & 1 deletion caf_launchpad/documentation/variables.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ There are two launchpad versions that can be deployed in an Azure subscription.
|---|
```hcl
default = {
default_location = "southeastasia"
default_location = "australiacentral"
prefix = null
}
```
Expand Down
4 changes: 2 additions & 2 deletions caf_launchpad/scenario/100/configuration.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ default_region = "region1"
inherit_tags = true

regions = {
region1 = "southeastasia"
region2 = "eastasia"
region1 = "australiaeast"
region2 = "australiacentral"
}

launchpad_key_names = {
Expand Down
4 changes: 2 additions & 2 deletions caf_launchpad/scenario/200/configuration.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ enable = {
default_region = "region1"

regions = {
region1 = "southeastasia"
region2 = "eastasia"
region1 = "australiaeast"
region2 = "australiacentral"
}

# core tags to be applied accross this landing zone
Expand Down
4 changes: 2 additions & 2 deletions caf_launchpad/scenario/200/diagnostics_destinations.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ diagnostics_destinations = {
# in the region of the deployment
storage = {
all_regions = {
southeastasia = {
australiaeast = {
storage_account_key = "diagsiem_region1"
}
eastasia = {
australiacentral = {
storage_account_key = "diagsiem_region2"
}
}
Expand Down
2 changes: 1 addition & 1 deletion caf_launchpad/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ variable "regions" {
type = map(any)
description = "List of the regions where services can be deployed. This impact the diagnostics logs settings"
default = {
region1 = "southeastasia"
region1 = "australiaeast"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ vnets = {
}

azurerm_firewalls = {
# Southeastasia firewall (do not change the key when created)
# firewall (do not change the key when created)
fw_re1 = {
region = "region1"
name = "azfwre1"
Expand Down
12 changes: 2 additions & 10 deletions templates/ansible/load_deployments_alz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
- item.state == 'file'
- item.path is not search(".j2")
- item.path is not search(".yaml") or item.path is search(".json") or item.path is search(".md")
- topology.management_groups[region][service].update_lib_folder | default(False)
- topology.management_groups[region][service].update_lib_folder | default(True)


- name: " Lib"
Expand All @@ -60,15 +60,7 @@
when:
- item.state == 'file'
- item.path is search(".yaml")
- topology.management_groups[region][service].update_lib_folder | default(False)

# - name: "{{deployment_mode}}/{{stage}}/{{region}}/{{service}} to {{destination_path}}/{{'alz_' + service}}.yaml"
# ansible.builtin.template:
# src: "{{ lookup('template', '{{ platform_service_folder + \"/\" + topology.deployments[deployment_mode][stage][region][service]}}') | from_yaml }}"
# dest: "{{destination_path}}/{{'alz_' + service}}.yaml"
# force: yes
# vars:
# item: "{{service}}"
- topology.management_groups[region][service].update_lib_folder | default(True)

- name: "{{deployment_mode}}/{{stage}}/{{region}}/{{service}} to {{destination_path}}/{{'alz_' + service}}.yaml"
ansible.builtin.template:
Expand Down
4 changes: 2 additions & 2 deletions templates/ansible/walk-through-single.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
prompt: Azure regions (lowercase, short version)
private: no
default:
region1: southeastasia
region2: eastasia
region1: australiaeast
region2: australiacentral

- name: default_region_key
prompt: Default CAF Azure region key
Expand Down
1 change: 0 additions & 1 deletion templates/platform/level0/launchpad/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ rover \
-launchpad \
-env {{ bootstrap.caf_environment }} \
-level {{ level }} \
-p ${TF_DATA_DIR}/{{ tfstate_object.tfstate }}.tfplan \
-a destroy

```
13 changes: 13 additions & 0 deletions templates/platform/single_subscription.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
#
# If you are changing a value in this file you need to execute the following command to update the definition folder
#
# ansible-playbook {{public_templates_folder}}/ansible/walk-through-single.yaml \
# --extra-vars "@{{platform_definition_folder}}/ignite.yaml"
#
# then update the Terraform configuration files with
#
# ansible-playbook {{public_templates_folder}}/ansible/ansible.yaml \
# --extra-vars "@{{platform_definition_folder}}/ignite.yaml"
#
#

customer_name: {{customer_name}}
caf_environment: {{caf_environment}}
default_email_address: {{default_email_address}}
Expand Down
2 changes: 1 addition & 1 deletion templates/platform/template_topology.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ bootstrap:
deploy_core_landing_zones: True
clean_up_destination_folder: True
update_lib_folder: True
version_to_deploy: "v1.1.1"
version_to_deploy: "v1.1.3"

subscription_deployment_mode: single_reuse

Expand Down