Update scale_out_domain_keys

templates/ansible/ansible.yaml

@@ -130,3 +130,6 @@
         lz_type: "{{deployment_mode}}"
         stage: scale_out_domains
       
+    - name: Format and validate file
+      shell: "terraform fmt -recursive {{ platform_configuration_folder }}"
+      register: fmt

templates/ansible/load_variables.yaml

@@ -78,7 +78,7 @@
     exported_variable_name: private_dns
   loop_control: 
     loop_var: env
-  loop: "{{ deployments.scale_out_domains }}"
+  loop: "{{ deployments.platform.scale_out_domain_keys }}"
 
 # Virtual hub prod
 - name: tfstate - virtual hub prod to variable
@@ -90,7 +90,7 @@
     exported_variable_name: virtual_hubs_resources
   loop_control: 
     loop_var: env
-  loop: "{{ deployments.scale_out_domains }}"
+  loop: "{{ deployments.platform.scale_out_domain_keys }}"
 
 # Secure firewalls prod
 - name: tfstate - secure firewall prod to variable
@@ -102,7 +102,7 @@
     exported_variable_name: secure_firewalls_resources
   loop_control: 
     loop_var: env
-  loop: "{{ deployments.scale_out_domains }}"
+  loop: "{{ deployments.platform.scale_out_domain_keys }}"
 
 
 # azurerm_firewall_policies
@@ -115,7 +115,7 @@
     exported_variable_name: private_dns_firewalls
   loop_control: 
     loop_var: env
-  loop: "{{ deployments.scale_out_domains }}"
+  loop: "{{ deployments.platform.scale_out_domain_keys }}"
 
 # Platform asvm storage accounts
 - name: tfstate - level2_storage_account from launchpad to variable

templates/asvm/orion/ignite.yaml

@@ -1,6 +1,8 @@
 
 landingzone_definition: {{landingzone_definition}}
 
+caf_landingzone_branch: int.5.6.0
+
 subscriptions:
 {% for env in scale_out_domains %}
   {{landingzone_definition}}_{{env}}:
@@ -16,7 +18,7 @@ subscriptions:
 
 deployments:
   platform:
-    scale_out_domains:
+    scale_out_domain_keys:
       - prod
       - non_prod
   asvm:

templates/asvm/orion/readme_definition.md

@@ -4,7 +4,9 @@
 
 ```bash
 ansible-playbook {{public_templates_folder}}/ansible/ansible.yaml \
-  --extra-vars "@{{template_folder}}/ignite.yaml"
+  --extra-vars "@{{template_folder}}/ignite.yaml"  \
+  -e base_folder=$(pwd)
+
 
 ```
 
@@ -12,6 +14,7 @@ ansible-playbook {{public_templates_folder}}/ansible/ansible.yaml \
 
 ```bash
 ansible-playbook {{public_templates_folder}}/ansible/asvm_definition.yaml \
-  --extra-vars "@{{template_folder}}/ignite.yaml"
+  --extra-vars "@{{template_folder}}/ignite.yaml" \
+  -e base_folder=$(pwd)
 
 ```

templates/asvm/orion/resources.asvm.yaml

@@ -1,6 +1,6 @@
 {{landingzone_definition}}_{{env}}:
   gitops:
-    caf_landingzone_branch: 2203.0
+    caf_landingzone_branch: {{caf_landingzone_branch}}
 
   relative_destination_folder: level3/{{landingzone_definition}}/{{env}}
 
@@ -399,7 +399,7 @@
                   time: "23:00"
                 retention_daily:
                   count: 7
-{% if private_endpoints %}
+{% if private_endpoints is defined %}
           private_endpoints:
             asr:
               name: vault-{{landingzone_definition}}-{{env}}
@@ -411,7 +411,7 @@
                 is_manual_connection: false
                 subresource_names:
                   - vault
-{% if private_endpoints and private_dns is defined %}
+{% if private_endpoints is defined and private_dns is defined %}
               private_dns:
                 zone_group_name: default
                 lz_key: connectivity_private_dns_{{deployments.asvm.mappings[env]}}
@@ -431,7 +431,7 @@
             ip_rules:
               {{ PUBLIC_IP_WHITE_LIST | default('None') }}
 {% endif %}
-{% if private_endpoints %}
+{% if private_endpoints is defined %}
           private_endpoints:
             level2:
               name: {{landingzone_definition}}{{env}}001
@@ -443,7 +443,7 @@
                 is_manual_connection: false
                 subresource_names:
                   - vault
-{% if private_endpoints and private_dns is defined %}
+{% if private_endpoints is defined and private_dns is defined %}
               private_dns:
                 zone_group_name: default
                 lz_key: connectivity_private_dns_{{deployments.asvm.mappings[env]}}

templates/asvm/orion/subscriptions.asvm.yaml

@@ -1,6 +1,6 @@
 asvm_subscriptions:
   gitops:
-    caf_landingzone_branch: 2203.0
+    caf_landingzone_branch: {{caf_landingzone_branch}}
 
   relative_destination_folder: level3/{{landingzone_definition}}/subscriptions