Merging experimental into scaleout-hsr prior to unit testing (#630)

Bring in commits from experimental --------- Co-authored-by: Steffen Bo Thomsen <[email protected]> Co-authored-by: devanshjain <[email protected]> Co-authored-by: Nadeen Noaman <[email protected]> Co-authored-by: hdamecharla <[email protected]> Co-authored-by: daradicscsaba <[email protected]> Co-authored-by: Csaba Daradics <[email protected]> Co-authored-by: Jesper Severinsen <[email protected]> Co-authored-by: Devansh Jain <[email protected]> Co-authored-by: Jaskirat Singh <[email protected]> Co-authored-by: jasksingh <[email protected]> Co-authored-by: Kimmo Forss <[email protected]> Co-authored-by: Harm Jan Stam <[email protected]> Co-authored-by: Kimmo Forss <[email protected]>
Azure · Sep 13, 2024 · 341dcbe · 341dcbe
1 parent b9d9b4b
commit 341dcbe
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 23 deletions.
diff --git a/deploy/ansible/playbook_04_00_00_db_install.yaml b/deploy/ansible/playbook_04_00_00_db_install.yaml
@@ -361,9 +361,6 @@
             - name:                        "Database Installation Playbook: - Clear the failed state of hosts"
               ansible.builtin.meta:        clear_host_errors
 
-            - name:                        "Database Installation Playbook: - Clear the failed state of hosts"
-              ansible.builtin.meta:        clear_host_errors
-
             # - name:                    "Database installation Playbook: - run HANA Scale-Out mounts"
             #   ansible.builtin.include_role:
             #     name:                   roles-sap-os/2.6-sap-mounts

diff --git a/deploy/ansible/roles-os/1.3-repository/vars/repos.yaml b/deploy/ansible/roles-os/1.3-repository/vars/repos.yaml
@@ -30,8 +30,9 @@ repos:
   redhat8.8:
     - { tier:   'os', repo: 'epel', url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm', state: 'present' }
   redhat8.9:
-#    - { tier:   'ha', repo: 'epel', url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm', state: 'present' }
+    - { tier:   'os', repo: 'epel', url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm', state: 'present' }
   redhat8.10:
+    - { tier:   'os', repo: 'epel', url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm', state: 'present' }
   redhat9.0:
     - { tier:   'os', repo: 'epel', url: 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm', state: 'present' }
   redhat9.2:

diff --git a/deploy/ansible/roles-sap-os/2.6-sap-mounts/tasks/main.yaml b/deploy/ansible/roles-sap-os/2.6-sap-mounts/tasks/main.yaml
@@ -342,13 +342,13 @@
 
 # Update : Deprecated as the scale out anf mount code functionality is now integrated into 2.6.1 and 2.6.8
 # This will be removed in the next release, left here for tracing and documentation
-# Import this task only if db_scale_out is defined. Implies that sap_mnt is defined, i.e. ANF is used
+# Import this task only if database_scale_out is defined. Implies that sap_mnt is defined, i.e. ANF is used
 # - name:                                "2.6 SAP Mounts: - Import ANF tasks for Scale-Out"
 #   ansible.builtin.import_tasks:        2.6.1.2-anf-mounts-scaleout.yaml
 #   when:
 #     - NFS_provider == 'ANF'
-#     - db_scale_out is defined
-#     - db_scale_out
+#     - database_scale_out is defined
+#     - database_scale_out
 #     - sap_mnt is defined or sap_trans is defined or usr_sap_install_mountpoint is defined
 
 # Import this task only if the tier is ora.
@@ -389,13 +389,13 @@
 
 # Update : Deprecated as the scale out anf mount code functionality is now integrated into 2.6.1 and 2.6.8
 # This will be removed in the next release, left here for tracing and documentation
-# Import this task only if db_scale_out is defined. Implies that sap_mnt is defined, i.e. ANF is used
+# Import this task only if database_scale_out is defined. Implies that sap_mnt is defined, i.e. ANF is used
 # - name:                                "2.6 SAP Mounts: - Import ANF tasks for Scale-Out"
 #   ansible.builtin.import_tasks:        2.6.1.2-anf-mounts-scaleout.yaml
 #   when:
 #     - NFS_provider == 'ANF'
-#     - db_scale_out is defined
-#     - db_scale_out
+#     - database_scale_out is defined
+#     - database_scale_out
 #     - sap_mnt is defined or sap_trans is defined or usr_sap_install_mountpoint is defined
 
 # Import this task only if the tier is ora.

diff --git a/deploy/ansible/roles-sap/5.5-hanadb-pacemaker/tasks/5.5.4.1-cluster-RedHat.yml b/deploy/ansible/roles-sap/5.5-hanadb-pacemaker/tasks/5.5.4.1-cluster-RedHat.yml
@@ -136,7 +136,7 @@
     - name:                            "5.5.4.1 HANA Cluster configuration - Set the cluster properties for two node clusters"
       when:
         - database_high_availability
-        - not db_scale_out
+        - not database_scale_out
         - is_pcmk_ver_gt_204
       block:
         - name:                        "5.5.4.1 HANA Cluster configuration - set resource defaults 'priority'"

diff --git a/deploy/scripts/New-SDAFDevopsProject.ps1 b/deploy/scripts/New-SDAFDevopsProject.ps1
@@ -25,7 +25,7 @@ $ControlPlaneSubscriptionName = $Env:SDAF_ControlPlaneSubscriptionName
 if ($IsWindows) { $pathSeparator = "\" } else { $pathSeparator = "/" }
 #endregion
 
-$versionLabel = "v3.11.0.3"
+$versionLabel = "v3.12.0.0"
 
 # az logout
 

diff --git a/deploy/terraform/bootstrap/sap_deployer/transform.tf b/deploy/terraform/bootstrap/sap_deployer/transform.tf
@@ -220,4 +220,16 @@ locals {
                                            app_id = var.app_registration_app_id
                                            client_secret = var.webapp_client_secret
                                          }
+
+  dns_settings                         = {
+                                           use_custom_dns_a_registration = var.use_custom_dns_a_registration
+                                           dns_zone_names = var.dns_zone_names
+
+                                           management_dns_resourcegroup_name = trimspace(var.management_dns_resourcegroup_name)
+                                           management_dns_subscription_id = trimspace(var.management_dns_subscription_id)
+
+                                           privatelink_dns_subscription_id = trimspace(coalesce(var.privatelink_dns_subscription_id,var.management_dns_subscription_id, " "))
+                                           privatelink_dns_resourcegroup_name = trimspace(coalesce(var.management_dns_resourcegroup_name, var.privatelink_dns_resourcegroup_name, " "))
+                                         }
+
 }
diff --git a/deploy/terraform/terraform-units/modules/sap_landscape/outputs.tf b/deploy/terraform/terraform-units/modules/sap_landscape/outputs.tf
@@ -563,14 +563,3 @@ output "ng_resource_id"                        {
                                                   description = "Azure resource identifier for the NAT Gateway"
                                                   value       = local.create_nat_gateway ? azurerm_nat_gateway.ng[0].id : ""
                                                 }
-
-###############################################################################
-#                                                                             #
-#                        NAT Gateway resource properties                      #
-#                                                                             #
-###############################################################################
-
-output "ng_resource_id"                        {
-                                                  description = "Azure resource identifier for the NAT Gateway"
-                                                  value       = local.create_nat_gateway ? azurerm_nat_gateway.ng[0].id : ""
-                                                }