Azure
diff --git a/‎Webapp/.vs/ProjectEvaluation/sdaf.metadata.v5.2‎
-206 KB b/‎Webapp/.vs/ProjectEvaluation/sdaf.metadata.v5.2‎
-206 KB
diff --git a/‎Webapp/.vs/ProjectEvaluation/sdaf.projects.v5.2‎
-144 KB b/‎Webapp/.vs/ProjectEvaluation/sdaf.projects.v5.2‎
-144 KB
diff --git a/‎Webapp/SDAF/Models/LandscapeModel.cs‎
Lines changed: 2 additions & 0 deletions b/‎Webapp/SDAF/Models/LandscapeModel.cs‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎Webapp/SDAF/Models/SystemModel.cs‎
Lines changed: 6 additions & 0 deletions b/‎Webapp/SDAF/Models/SystemModel.cs‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎Webapp/SDAF/ParameterDetails/LandscapeDetails.json‎
Lines changed: 9 additions & 0 deletions b/‎Webapp/SDAF/ParameterDetails/LandscapeDetails.json‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎Webapp/SDAF/ParameterDetails/LandscapeTemplate.txt‎
Lines changed: 6 additions & 2 deletions b/‎Webapp/SDAF/ParameterDetails/LandscapeTemplate.txt‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎Webapp/SDAF/ParameterDetails/SystemDetails.json‎
Lines changed: 58 additions & 31 deletions b/‎Webapp/SDAF/ParameterDetails/SystemDetails.json‎
Lines changed: 58 additions & 31 deletions
diff --git a/‎Webapp/SDAF/ParameterDetails/SystemTemplate.txt‎
Lines changed: 9 additions & 0 deletions b/‎Webapp/SDAF/ParameterDetails/SystemTemplate.txt‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎deploy/ansible/filter_plugins/custom_filters.py‎
Lines changed: 9 additions & 3 deletions b/‎deploy/ansible/filter_plugins/custom_filters.py‎
Lines changed: 9 additions & 3 deletions
diff --git a/‎deploy/ansible/pb_get-sshkey.yaml‎
Lines changed: 19 additions & 10 deletions b/‎deploy/ansible/pb_get-sshkey.yaml‎
Lines changed: 19 additions & 10 deletions
@@ -34,6 +34,8 @@ public bool IsValid()
         public string name_override_file { get; set; }
         public bool? save_naming_information { get; set; }
 
+        public bool? place_delete_lock_on_resources { get; set; } = false;
+
         [RequiredIfNotDefault]
         [DisplayName("Network name")]
         [RegularExpression(@"^\w{0,7}$", ErrorMessage = "Logical network name cannot exceed seven characters")]
 
@@ -444,6 +444,12 @@ public bool IsValid()
 
         public bool? deploy_v1_monitoring_extension { get; set; } = true;
 
+        public bool? use_scalesets_for_deployment { get; set; } = false;
+
+        public bool? database_use_premium_v2_storage { get; set; } = false;
+
+        public bool? ANF_HANA_use_AVG { get; set; } = false;
+
         [DisplayName("Web SID")]
         public string web_sid { get; set; }
 
 
@@ -103,6 +103,15 @@
         "Overrules": "",
         "Display": 2
       },
+      {
+        "Name": "place_delete_lock_on_resources",
+        "Required": false,
+        "Description": " If defined, a delete lock will be placed on the key resources (virtual network and key vault)",
+        "Type": "checkbox",
+        "Options": [],
+        "Overrules": "",
+        "Display": 2
+      },
       {
         "Name": "resourcegroup_name",
         "Required": false,
 
@@ -79,6 +79,10 @@ $$peer_with_control_plane_vnet$$
 # Defines if access to the key vaults and storage accounts is restricted to the SAP and deployer VNets
 $$enable_firewall_for_keyvaults_and_storage$$
 
+
+# place_delete_lock_on_resources, If defined, a delete lock will be placed on the key resources
+$$place_delete_lock_on_resources$$
+
 #########################################################################################
 #                                                                                       #
 #  Admin Subnet variables                                                               #
@@ -286,11 +290,11 @@ $$storage_account_replication_type$$
 #########################################################################################
 
 # The two resource group name and arm_id can be used to control the naming and the creation of the resource group
-# The resourcegroup_name value is optional, it can be used to override the name of the resource group that will be provisioned
-# The resourcegroup_name arm_id is optional, it can be used to provide an existing resource group for the deployment
 
+# The resourcegroup_name value is optional, it can be used to override the name of the resource group that will be provisioned
 $$resourcegroup_name$$
 
+# The resourcegroup_name arm_id is optional, it can be used to provide an existing resource group for the deployment
 $$resourcegroup_arm_id$$
 
 
 
@@ -63,6 +63,11 @@ $$use_secondary_ips$$
 # subscription is the subscription in which the system will be deployed (informational only)
 $$subscription$$
 
+# use_scalesets_for_deployment defines if Flexible Virtual Machine Scale Sets are used for the deployment
+$$use_scalesets_for_deployment$$
+
+# database_use_premium_v2_storage defines if the database tier will use premium v2 storage
+$$database_use_premium_v2_storage$$
 
 #########################################################################################
 #                                                                                       #
@@ -449,6 +454,10 @@ $$sapmnt_private_endpoint_id$$
 
 # use_random_id_for_storageaccounts defines if the sapmnt storage account name will have a random suffix
 $$use_random_id_for_storageaccounts$$
+
+# ANF_HANA_use_AVG defines if the ANF volume will be created in an Application Volume Group
+$$ANF_HANA_use_AVG$$
+
 #########################################################################################
 #                                                                                       #
 #  HANA Data                                                                            #
 
@@ -23,7 +23,13 @@
         {'task_tag=zypper_registration'}),
     (r'(.*)Zypper run command failed with return code 7(.*)',
         'INSTALL:0019:Update OS Packages has failed for host since zypper was locked by another process.',
-        {'task_tag=update_os_package'})
+        {'task_tag=update_os_package'}),
+    (r'([\s\d\w\D\W]*)Connect to message server([\s\w\d\W\D]*)Make sure that the message server is started([\s\w\d\W\D]*)',
+        'INSTALL:0020:DB Load failure, unable to connect to message server.',
+        {'task_tag=dbload', 'failure=messageserver_offline'}),
+    (r'([\s\d\w\D\W]*)Make sure the database is online([\s\w\d\W\D]*)',
+        'INSTALL:0021:DB Load failure, database is offline.',
+        {'task_tag=dbload', 'failure=db_offline'})
 ]
 
 # Takes a dictionary and converts it into a set of
@@ -141,7 +147,7 @@ def filters(self):
 #         }
 #     ]
 # }
-# message = "non-zero return code"
+# message = "asdConnect to message server\n<>>Make sure that the message server is started*asd\n"
 # print(try_get_error_code_results(result, task_tag="update_os_packages", host_name="host"))
-# print(try_get_error_code(message, task_tag="zypper_registration"))
+# print(try_get_error_code(message,task_tag="dbload_messageserver"))
 # convert_kwargs_to_tags(None)
@@ -20,17 +20,26 @@
       ansible.builtin.set_fact:
         secret_name:                   "{{ secret_prefix }}-sid-sshkey"
 
+    - name:                                Retrieve SSH Key secret details and rescue on failure
+      block:
+        - name:                            Retrieve SSH Key secret details
+          ansible.builtin.command: >-
+                                          az keyvault secret show
+                                            --vault-name {{ kv_name }}
+                                            --name {{ secret_name }}
+                                            --query value
+                                            --output tsv
+          changed_when:                    false
+          register:                        keyvault_secret_show
+          no_log:                          true
+      rescue:
+        - name:                           Rescue Log the error message to be transformed
+          ansible.builtin.debug:
+            msg:                          "Error message to transform: {{ keyvault_secret_show.stderr }}"
 
-    - name:                            Retrieve SSH Key secret details
-      ansible.builtin.command: >-
-                                       az keyvault secret show
-                                         --vault-name {{ kv_name }}
-                                         --name {{ secret_name }}
-                                         --query value
-                                         --output tsv
-      changed_when:                    false
-      register:                        keyvault_secret_show
-      no_log:                          true
+        - name:                           Rescue Retrieve SSH Key secret details
+          ansible.builtin.fail:
+            msg:                            "{{ keyvault_secret_show.stderr | try_get_error_code }}"
 
     - name:                            Extract SSH Key content from secret details
       ansible.builtin.set_fact: