Merge pull request #336 from Azure/patch.2203.1.ignite

Deploy template library on initial setup with ignite
Azure · Mar 17, 2022 · 6456648 · 6456648
2 parents 0a48753 + 2e10962
commit 6456648
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 23 deletions.
diff --git a/caf_launchpad/documentation/variables.md b/caf_launchpad/documentation/variables.md
@@ -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
 }
 ```

diff --git a/caf_launchpad/scenario/100/configuration.tfvars b/caf_launchpad/scenario/100/configuration.tfvars
@@ -21,8 +21,8 @@ default_region = "region1"
 inherit_tags = true
 
 regions = {
-  region1 = "southeastasia"
-  region2 = "eastasia"
+  region1 = "australiaeast"
+  region2 = "australiacentral"
 }
 
 launchpad_key_names = {

diff --git a/caf_launchpad/scenario/200/configuration.tfvars b/caf_launchpad/scenario/200/configuration.tfvars
@@ -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

diff --git a/caf_launchpad/scenario/200/diagnostics_destinations.tfvars b/caf_launchpad/scenario/200/diagnostics_destinations.tfvars
@@ -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"
       }
     }

diff --git a/caf_launchpad/variables.tf b/caf_launchpad/variables.tf
@@ -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"
   }
 }
 

diff --git a/caf_solution/scenario/networking/105-hub-and-spoke/configuration.tfvars b/caf_solution/scenario/networking/105-hub-and-spoke/configuration.tfvars
@@ -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"

diff --git a/templates/ansible/load_deployments_alz.yaml b/templates/ansible/load_deployments_alz.yaml
@@ -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"
@@ -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:

diff --git a/templates/ansible/walk-through-single.yaml b/templates/ansible/walk-through-single.yaml
@@ -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

diff --git a/templates/platform/level0/launchpad/readme.md b/templates/platform/level0/launchpad/readme.md
@@ -127,7 +127,6 @@ rover \
   -launchpad \
   -env {{ bootstrap.caf_environment }} \
   -level {{ level }} \
-  -p ${TF_DATA_DIR}/{{ tfstate_object.tfstate }}.tfplan \
   -a destroy
 
 ```
diff --git a/templates/platform/single_subscription.yaml b/templates/platform/single_subscription.yaml
@@ -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}}

diff --git a/templates/platform/template_topology.yaml b/templates/platform/template_topology.yaml
@@ -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