Merge branch 'experimental' into quickFix

mkdeegan · Mar 21, 2024 · 93aa452 · 93aa452
2 parents 9990f8b + 1fff160
commit 93aa452
Show file tree

Hide file tree

Showing 86 changed files with 2,545 additions and 671 deletions.
diff --git a/.github/workflows/github-actions-ansible-lint.yml b/.github/workflows/github-actions-ansible-lint.yml
@@ -9,7 +9,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

diff --git a/Webapp/SDAF/Models/SystemModel.cs b/Webapp/SDAF/Models/SystemModel.cs
@@ -213,15 +213,29 @@ public bool IsValid()
     public bool? use_simple_mount { get; set; } = false;
 
     public string database_cluster_type { get; set; } = "AFA";
+
     public string scs_cluster_type { get; set; } = "AFA";
 
+
+    public int? scs_cluster_disk_lun { get; set; } = 5;
+
+    public int? scs_cluster_disk_size { get; set; } = 128;
+
+    public string scs_cluster_disk_type { get; set; } = "Premium_ZRS";
+
+    public int? database_cluster_disk_lun { get; set; } = 8;
+
+    public int? database_cluster_disk_size { get; set; } = 128;
+
+    public string database_cluster_disk_type { get; set; } = "Premium_ZRS";
+
     /*---------------------------------------------------------------------------8
     |                                                                            |
     |                          PPG information                                   |
     |                                                                            |
     +------------------------------------4--------------------------------------*/
 
-    
+
     public string[] proximityplacementgroup_names { get; set; }
 
     [PpgIdValidator]
@@ -285,7 +299,7 @@ public bool IsValid()
     [IpAddressValidator]
     public string[] database_vm_db_nic_ips { get; set; }
 
-    
+
     [IpAddressValidator]
     public string[] database_vm_db_nic_secondary_ips { get; set; }
 
@@ -492,7 +506,7 @@ public bool IsValid()
 
     public int? ANF_HANA_data_volume_throughput { get; set; }
 
-    public int? ANF_hana_data_volume_count { get; set; } = 1;
+    public int? ANF_HANA_data_volume_count { get; set; } = 1;
 
     /*---------------------------------------------------------------------------8
     |                                                                            |
@@ -509,7 +523,7 @@ public bool IsValid()
 
     public int? ANF_HANA_log_volume_throughput { get; set; }
 
-    public int? ANF_hana_log_volume_count { get; set; } = 1;
+    public int? ANF_HANA_log_volume_count { get; set; } = 1;
 
     /*---------------------------------------------------------------------------8
     |                                                                            |

diff --git a/Webapp/SDAF/ParameterDetails/SystemDetails.json b/Webapp/SDAF/ParameterDetails/SystemDetails.json
@@ -1363,6 +1363,78 @@
         "Overrules": "",
         "Display": 2
       },
+      {
+        "Name": "scs_cluster_disk_lun",
+        "Required": false,
+        "Description": "The LUN of the shared disk for the SAP Central Services cluster",
+        "Type": "field",
+        "Options": [],
+        "Overrules": "",
+        "Display": 3
+      },
+      {
+        "Name": "scs_cluster_disk_size",
+        "Required": false,
+        "Description": "The size of the shared disk for the SAP Central Services cluster",
+        "Type": "field",
+        "Options": [],
+        "Overrules": "",
+        "Display": 3
+      },
+      {
+        "Name": "scs_cluster_disk_type",
+        "Required": false,
+        "Description": "The storage_account_type of the shared disk for the SAP Central Services cluster",
+        "Type": "lookup",
+        "Options": [
+          {
+            "Text": "Premium LRS",
+            "Value": "Premium_LRS"
+          },
+          {
+            "Text": "Premium ZRS",
+            "Value": "Premium_ZRS"
+          }
+        ],
+        "Overrules": "",
+        "Display": 3
+      },
+      {
+        "Name": "database_cluster_disk_lun",
+        "Required": false,
+        "Description": "The LUN of the shared disk for the Database cluster",
+        "Type": "field",
+        "Options": [],
+        "Overrules": "",
+        "Display": 3
+      },
+      {
+        "Name": "database_cluster_disk_size",
+        "Required": false,
+        "Description": "The size of the shared disk for the Database cluster",
+        "Type": "field",
+        "Options": [],
+        "Overrules": "",
+        "Display": 3
+      },
+      {
+        "Name": "database_cluster_disk_type",
+        "Required": false,
+        "Description": "The storage_account_type of the shared disk for the Database cluster",
+        "Type": "lookup",
+        "Options": [
+          {
+            "Text": "Premium LRS",
+            "Value": "Premium_LRS"
+          },
+          {
+            "Text": "Premium ZRS",
+            "Value": "Premium_ZRS"
+          }
+        ],
+        "Overrules": "",
+        "Display": 3
+      },
       {
         "Name": "use_msi_for_clusters",
         "Required": false,
@@ -1935,7 +2007,7 @@
         "Display": 3
       },
       {
-        "Name": "ANF_hana_data_volume_count",
+        "Name": "ANF_HANA_data_volume_count",
         "Required": false,
         "Description": "Number of ANF Data Volumes",
         "Type": "field",
@@ -1995,7 +2067,7 @@
         "Display": 3
       },
       {
-        "Name": "ANF_hana_data_volume_count",
+        "Name": "ANF_HANA_data_volume_count",
         "Required": false,
         "Description": "Number of ANF Data Volumes",
         "Type": "field",

diff --git a/Webapp/SDAF/ParameterDetails/SystemTemplate.txt b/Webapp/SDAF/ParameterDetails/SystemTemplate.txt
@@ -118,9 +118,27 @@ $$use_private_endpoint$$
 # scs_cluster_type defines cluster quorum type; AFA (Azure Fencing Agent), ASD (Azure Shared Disk), ISCSI
 $$scs_cluster_type$$
 
+#scs_cluster_disk_lun defines the LUN number for the SAP Central Services cluster disk
+$$scs_cluster_disk_lun$$
+
+#scs_cluster_disk_size defines the size for the SAP Central Services cluster disk
+$$scs_cluster_disk_size$$
+
+#scs_cluster_disk_type defines the storage_account_type of the shared disk for the SAP Central Services cluster
+$$scs_cluster_disk_type$$
+
 # database_cluster_type defines cluster quorum type; AFA (Azure Fencing Agent), ASD (Azure Shared Disk), ISCSI
 $$database_cluster_type$$
 
+#database_cluster_disk_lun defines the LUN number for the database cluster disk
+$$database_cluster_disk_lun$$
+
+#database_cluster_disk_size defines the size for the database cluster disk
+$$database_cluster_disk_size$$
+
+#database_cluster_disk_type defines the storage_account_type of the shared disk for the Database cluster
+$$database_cluster_disk_type$$
+
 # use_msi_for_clusters if defined will use managed service identity for the Pacemaker cluster fencing
 $$use_msi_for_clusters$$
 
@@ -525,7 +543,7 @@ $$ANF_HANA_data_use_existing_volume$$
 $$ANF_HANA_data_volume_name$$
 
 # Number of ANF Data Volumes
-$$ANF_hana_data_volume_count$$
+$$ANF_HANA_data_volume_count$$
 
 
 #########################################################################################
@@ -550,7 +568,7 @@ $$ANF_HANA_log_use_existing$$
 $$ANF_HANA_log_volume_name$$
 
 # Number of ANF Data Volumes
-$$ANF_hana_log_volume_count$$
+$$ANF_HANA_log_volume_count$$
 
 #########################################################################################
 #                                                                                       #

diff --git a/deploy/ansible/playbook_00_validate_parameters.yaml b/deploy/ansible/playbook_00_validate_parameters.yaml
@@ -363,13 +363,13 @@
 
     - name:                            "0.0 Validations - Deployer disk space requirements"
       ansible.builtin.set_fact:
-        deployer_free_temp_disk_space: 100
+        deployer_free_temp_disk_space: 40
       when:
         - deployer_free_temp_disk_space is not defined
 
     - name:                            "0.0 Validations - Check for free disk space on deployer"
       ansible.builtin.assert:
-        that:                          (mnt_free_diskspace | first | int / (1024 * 1024 * 1024) | int) > (deployer_free_temp_disk_space | int)
+        that:                          (mnt_free_diskspace | first | int / (1024 * 1024 * 1024) | int) > (40 )
         fail_msg:                      "The deployer needs at least {{ deployer_free_temp_disk_space }} GB of free disk space in /mnt"
       when:
         - mnt_free_diskspace | length > 0

diff --git a/deploy/ansible/playbook_03_bom_processing.yaml b/deploy/ansible/playbook_03_bom_processing.yaml
@@ -68,7 +68,6 @@
             sapbits_sas_token:         "{{ hostvars.localhost.sapbits_sas_token }}"
           when:                        hostvars.localhost.sapbits_sas_token is defined
 
-
         - name:                        3.3-bom-processing role for Linux
           become:                      true
           when:                        ansible_os_family != "Windows"

diff --git a/deploy/ansible/playbook_04_00_00_db_install.yaml b/deploy/ansible/playbook_04_00_00_db_install.yaml
@@ -402,6 +402,10 @@
           tags:
             - always
 
+        - name:                        "Configure accounts for oracle"
+          ansible.builtin.include_role:
+            name:                      roles-os/1.11-accounts
+
         - name:                        "Database Installation Playbook: - Check for file system mounts"
           ansible.builtin.include_role:
             name:                      roles-sap-os/2.6-sap-mounts

diff --git a/deploy/ansible/playbook_04_00_01_db_ha.yaml b/deploy/ansible/playbook_04_00_01_db_ha.yaml
@@ -304,6 +304,42 @@
             suffix:                   "_DC_ACTION_2"
             tier:                     'oracle'
 
+- hosts:                               "{{ sap_sid | upper }}_DB[1]"
+  name:                                DB Dataguard setup on secondary - Oracle
+  remote_user:                         "root"
+  gather_facts:                        true
+  vars_files:
+    - vars/ansible-input-api.yaml                               # API Input template with defaults
+
+  tasks:
+
+    - name:                            "Oracle Data Guard Setup on Secondary"
+      when:
+        - db_high_availability
+        - platform in ['ORACLE', 'ORACLE-ASM']
+      become:                          true
+      block:
+        - name:                        Setting the DB facts
+          ansible.builtin.set_fact:
+            tier:                      ora                                    # Actions for Oracle DB Servers
+            action:                    3
+            main_password:             "{{ hostvars.localhost.sap_password }}"
+          tags:
+            - always
+
+        - name:                        Oracle Data guard
+          ansible.builtin.include_role:
+            name:                      roles-db/4.1.3-ora-dg
+          tags:
+            - 4.1.3-ora-dg
+
+        - name:                       "Observer Playbook: - Run post installation routines"
+          ansible.builtin.include_role:
+            name:                     roles-sap/7.0.0-post-install
+          vars:
+            suffix:                   "_DC_ACTION_2"
+            tier:                     'oracle'
+
 # /*----------------------------------------------------------------------------8
 # |                                                                            |
 # |                         PLAY FOR Observer Node setup                       |
@@ -335,7 +371,7 @@
         - name:                            "Observer Playbook: Setting the DB facts"
           ansible.builtin.set_fact:
             node_tier:                     observer
-            action:                        3
+            action:                        4
             main_password:                 "{{ hostvars.localhost.sap_password }}"
           tags:
             - always