Refactor ansible

README.md

@@ -6,7 +6,7 @@ The framework uses Terraform for infrastructure deployment, and Ansible for the
 
 ## Enterprise-scale  - Reference Implementation
 
-![Ansible Lint](https://github.com/Azure/sap-automation/workflows/Ansible%20Lint/badge.svg)    [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/azure/sap-automation.svg)](http://isitmaintained.com/project/azure/sap-automation "Average time to resolve an issue")    [![Percentage of issues still open](http://isitmaintained.com/badge/open/azure/sap-automation.svg)](http://isitmaintained.com/project/azure/sap-automation "Percentage of issues still open")
+![Ansible Lint](https://github.com/Azure/sap-automation/workflows/Ansible%20Lint/badge.svg)    [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/azure/sap-automation.svg)](http://isitmaintained.com/project/azure/sap-automation "Average time to resolve an issue")    [![Percentage of issues still open](http://isitmaintained.com/badge/open/azure/sap-automation.svg)](http://isitmaintained.com/project/azure/sap-automation "Percentage of issues still open") [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/Azure/sap-automation/badge)](https://scorecard.dev/viewer/?uri=github.com/Azure/sap-automation)
 
 ## Partnership
 

Webapp/SDAF/SDAFWebApp.csproj

@@ -16,18 +16,18 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Data.Tables" Version="12.9.1" />
-    <PackageReference Include="Azure.Identity" Version="1.12.1" />
+    <PackageReference Include="Azure.Identity" Version="1.13.0" />
     <PackageReference Include="Azure.ResourceManager" Version="1.13.0" />
     <PackageReference Include="Azure.ResourceManager.Compute" Version="1.6.0" />
     <PackageReference Include="Azure.ResourceManager.KeyVault" Version="1.3.0" />
     <PackageReference Include="Azure.ResourceManager.Network" Version="1.9.0" />
     <PackageReference Include="Azure.ResourceManager.Resources" Version="1.9.0" />
     <PackageReference Include="Azure.ResourceManager.Storage" Version="1.3.0" />
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.22.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.33" />
-    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.5" />
-    <PackageReference Include="Microsoft.Identity.Web" Version="3.2.0" />
-    <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.2.0" />
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.22.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.35" />
+    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.6" />
+    <PackageReference Include="Microsoft.Identity.Web" Version="3.2.2" />
+    <PackageReference Include="Microsoft.Identity.Web.UI" Version="3.2.2" />
     <PackageReference Include="Microsoft.VisualStudio.Services.InteractiveClient" Version="19.241.0-preview" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

deploy/ansible/roles-os/1.1-swap/defaults/main.yaml

@@ -0,0 +1,8 @@
+---
+# TODO: Maybe move these to a group_vars/all/distro file so that they
+# can be shared by all playbooks/tasks automatically, and extend with
+# standardised versions of all similar patterns used in the playbooks.
+# Changed from ansible_os_family to ansible_distribution to adopt Oracle Linux. os_family returns returns value Redhat by default.
+distro_name:    "{{ ansible_distribution | upper }}-{{ ansible_distribution_major_version }}"
+distribution_id:      "{{ ansible_distribution | lower ~ ansible_distribution_major_version }}"
+distribution_full_id: "{{ ansible_distribution | lower ~ ansible_distribution_version }}"

deploy/ansible/roles-os/1.1-swap/tasks/main.yaml

@@ -35,9 +35,8 @@
     state:                             latest
   environment:
     ZYPP_LOCK_TIMEOUT:                 "20"
-
   when:
-    - ansible_os_family == 'Suse'
+    - distribution_id == 'sles_sap15'
   tags:
     - skip_ansible_lint
 

deploy/ansible/roles-os/1.17-generic-pacemaker/tasks/1.17.1-pre_checks.yml

@@ -10,6 +10,8 @@
   ansible.builtin.pip:
     name:                              passlib
     state:                             present
+  vars:
+    ansible_python_interpreter:        "python3"
   tags:
     - always
 

deploy/ansible/roles-sap-os/2.6-sap-mounts/library/setting_vars.py

@@ -0,0 +1,87 @@
+"""Settings Vars Module for SAP Mounts Role. This uses the AnsibleModule from the Ansible module_utils to set the parameters for the SAP mounts.
+"""
+from ansible.module_utils.basic import AnsibleModule
+
+def run_module():
+    """This function sets the parameters for the SAP mounts.
+        Input parameters are the SAP SID, HDBADM UID, platform, SIDADM UID, multi SIDs, asesidadm_uid(not required), SCS instance number, PAS instance number, APP instance number, server name and distribution full ID(not required). 
+        The output parameters are the SID, all_sap_mounts, first_server_temp, mnt_options and nfs_service.
+    """
+    distro_versions = [
+        "redhat8.4",
+        "redhat8.6",
+        "redhat8.8",
+        "redhat9.0",
+        "redhat9.2",
+        "sles_sap15.2",
+        "sles_sap15.3",
+        "sles_sap15.4",
+        "sles_sap15.5",
+    ]
+    module_args = dict(
+        sap_sid=dict(type="str", required=True),
+        hdbadm_uid=dict(type="str", required=True),
+        platform=dict(type="str", required=True),
+        sidadm_uid=dict(type="str", required=True),
+        multi_sids=dict(type="list", required=False),
+        asesidadm_uid=dict(type="str", required=False),
+        scs_instance_number=dict(type="str", required=True),
+        pas_instance_number=dict(type="str", required=True),
+        app_instance_number=dict(type="str", required=True),
+        server_name=dict(type="str", required=True),
+        distribution_full_id=dict(type="str", required=False),
+    )
+
+    result = {
+        "this_sid": {},
+        "all_sap_mounts": [],
+        "first_server_temp": [],
+        "mnt_options": {},
+        "nfs_service": "",
+    }
+
+    module = AnsibleModule(argument_spec=module_args, supports_check_mode=True)
+
+    distribution_full_id = module.params["distribution_full_id"]
+
+    result["this_sid"] = {
+        "sid": module.params["sap_sid"].upper(),
+        "dbsid_uid": module.params["hdbadm_uid"],
+        "sidadm_uid": (
+            module.params["asesidadm_uid"]
+            if module.params["platform"] == "SYSBASE"
+            else module.params["sidadm_uid"]
+        ),
+        "ascs_inst_no": module.params["scs_instance_number"],
+        "pas_inst_no": module.params["pas_instance_number"],
+        "app_inst_no": module.params["app_instance_number"],
+    }
+    try:
+        if module.params["multi_sids"] is not None:
+            result["all_sap_mounts"] = module.params["multi_sids"]
+
+        else:
+            result["all_sap_mounts"].append(result["this_sid"])
+
+    except Exception as e:
+        module.fail_json(msg=str(e), **result)
+
+    result["first_server_temp"].append(module.params["server_name"])
+
+    result["mnt_options"] = {
+        "afs_mnt_options": "noresvport,vers=4,minorversion=1,sec=sys",
+        "anf_mnt_options": "rw,nfsvers=4.1,hard,timeo=600,rsize=262144,wsize=262144,noatime,lock,_netdev,sec=sys" + (",nconnect=8" if distribution_full_id in distro_versions else ""),
+    }
+
+    nfs_service_mapping = {
+        "redhat8": "nfs-server",
+        "redhat9": "nfs-server",
+        "redhat7": "nfs",
+        "oraclelinux8": "rpcbind",
+    }
+    result["nfs_service"] = nfs_service_mapping.get(distribution_full_id, "nfsserver")
+
+    module.exit_json(**result)
+
+if __name__ == "__main__":
+    run_module()

deploy/ansible/roles-sap-os/2.6-sap-mounts/library/setting_vars_oracle.py

@@ -0,0 +1,28 @@
+"""Settings Vars Module for SAP Mounts Oracle Role. This uses the AnsibleModule from the Ansible module_utils to set the parameters for the SAP mounts on Oracle.
+"""
+from ansible.module_utils.basic import AnsibleModule
+
+def run_module():
+    """ This function sets the parameters for the SAP mounts on Oracle.
+        Input parameters are nfs_server and NFS_provider. 
+        The output parameters are nfs_server_temp and nfs_server.
+    """
+    module_args = dict(
+        nfs_server_temp=dict(type="str", required=True),
+        NFS_provider=dict(type="str", required=True),
+    )
+
+    result = {
+        "nfs_server_temp": [],
+        "nfs_server": "",
+    }
+
+    module = AnsibleModule(argument_spec=module_args, supports_check_mode=True)
+
+    result["nfs_server_temp"].append(module.params["nfs_server_temp"])
+
+    module.exit_json(**result)
+
+
+if __name__ == "__main__":
+    run_module()

deploy/ansible/roles-sap-os/2.6-sap-mounts/tasks/2.6.0-afs-mounts.yaml

@@ -5,39 +5,33 @@
 # |                                                                            |
 # +------------------------------------4--------------------------------------*/
 
-- name:                                "AFS Mount: Define this SID"
-  ansible.builtin.set_fact:
-    this_sid:
-      {
-        'sid': '{{ sap_sid | upper }}',
-        'dbsid_uid': '{{ hdbadm_uid }}',
-        'sidadm_uid': '{% if platform == "SYBASE" %}{{ asesidadm_uid }}{% else %}{{ sidadm_uid }}{% endif %}',
-        'ascs_inst_no': '{{ scs_instance_number }}',
-        'pas_inst_no': '{{ pas_instance_number }}',
-        'app_inst_no': '{{ app_instance_number }}'
-      }
-
-- name:                                "AFS Mount: Create list of all_sap_mounts to support "
-  ansible.builtin.set_fact:
-    all_sap_mounts:                    "{% if MULTI_SIDS is defined %}{{ MULTI_SIDS }}{% else %}{{ all_sap_mounts | default([]) + [this_sid] }}{% endif %}"
-
-- name:                                "AFS Mount: Get the Server name list"
-  ansible.builtin.set_fact:
-    first_server_temp:                 "{{ first_server_temp | default([]) + [item] }}"
+- name:                                "calling setting variables python script"
+  setting_vars:
+    sap_sid: "{{ sap_sid }}"
+    hdbadm_uid: "{{ hdbadm_uid }}"
+    platform: "{{ platform }}"
+    sidadm_uid: "{{ sidadm_uid }}"
+    multi_sids: "{{ multi_sids | default(omit) }}"
+    asesidadm_uid: "{{ asesidadm_uid | default(omit)}}"
+    scs_instance_number: "{{ scs_instance_number }}"
+    pas_instance_number: "{{ pas_instance_number }}"
+    app_instance_number: "{{ app_instance_number }}"
+    server_name: "{{ item }}"
   with_items:
     - "{{ query('inventory_hostnames', '{{ sap_sid | upper }}_SCS') }}"
     - "{{ query('inventory_hostnames', '{{ sap_sid | upper }}_DB') }}"
+  register: setting_vars_output
 
-- name:                                "AFS Mount: Set the NFSmount options"
-  ansible.builtin.set_fact:
-    afs_mnt_options:                   'noresvport,vers=4,minorversion=1,sec=sys'
 
 - name:                                "AFS Mount: Create list of all_sap_mounts to support"
   ansible.builtin.debug:
-    msg:
-      - "List of all the SAP mounts: {{ all_sap_mounts }}"
-      - "First server: {{ first_server_temp }}"
-    verbosity:                         2
+    msg: "TESTING list output: {{ setting_vars_output.results[0]['all_sap_mounts'] }}"
+#      - "List of all the SAP mounts: {{ setting_vars_output.all_sap_mounts }}"
+#      - "First server: {{ setting_vars_output.first_server_temp }}"
+
+- name: Set first_server_temp to the value from setting_vars_output
+  ansible.builtin.set_fact:
+    first_server_temp: "{{ setting_vars_output.results[0]['first_server_temp'] }}"
 
 - name:                                "AFS Mount: Create configuration file
                                         with additional optimization settings"
@@ -89,7 +83,7 @@
                 src:                   "{{ sap_mnt }}"
                 path:                  "/saptmp"
                 fstype:                "nfs4"
-                opts:                  "{{ afs_mnt_options }}"
+                opts:                  "{{ setting_vars_output.results[0]['mnt_options']['afs_mnt_options'] }}"
                 state:                 mounted
 
           rescue:
@@ -106,7 +100,7 @@
                 src:                   "{{ sap_mnt }}"
                 path:                  "/saptmp"
                 fstype:                "nfs4"
-                opts:                  "{{ afs_mnt_options }}"
+                opts:                  "{{ setting_vars_output.results[0]['mnt_options']['afs_mnt_options'] }}"
                 state:                 mounted
 
         - name:                        "AFS Mount: Create SAP Directories (AFS)"
@@ -129,7 +123,7 @@
             owner:                     '{{ item.sidadm_uid }}'
             group:                     sapsys
             mode:                      0755
-          loop:                        "{{ all_sap_mounts }}"
+          loop:                        "{{ setting_vars_output.results[0]['all_sap_mounts'] }}"
 
         - name:                        "AFS Mount: Unmount file systems (sapmnt)"
           ansible.posix.mount:
@@ -151,14 +145,14 @@
           ansible.builtin.file:
             path:                      "/saptmp/sapmnt{{ item.sid | upper }}"
             state:                     absent
-          loop:                        "{{ all_sap_mounts }}"
+          loop:                        "{{ setting_vars_output.results[0]['all_sap_mounts'] }}"
 
         - name:                        "AFS Mount: Cleanup fstab and directory (sapmnt)"
           ansible.posix.mount:
             src:                       "{{ sap_mnt }}"
             path:                      "/saptmp"
             fstype:                    "nfs4"
-            opts:                      "{{ afs_mnt_options }}"
+            opts:                      "{{ setting_vars_output.results[0]['mnt_options']['afs_mnt_options'] }}"
             state:                     absent
       when:
         - sap_mnt is defined
@@ -200,7 +194,7 @@
         path:                          "/sapmnt/{{ item.sid }}"
         state:                         directory
       register:                        is_created_now
-      loop:                            "{{ all_sap_mounts }}"
+      loop:                            "{{ setting_vars_output.results[0]['all_sap_mounts'] }}"
 
     - name:                            "AFS Mount: Change attribute only when we create SAP Directories (sapmnt)"
       ansible.builtin.file:
@@ -272,7 +266,7 @@
         src:                           "{{ item.src }}"
         path:                          "{{ item.path }}"
         fstype:                        "{{ item.type }}"
-        opts:                          "{{ afs_mnt_options }}"
+        opts:                          "{{ setting_vars_output.results[0]['mnt_options']['afs_mnt_options'] }}"
         state:                         mounted
       loop:
         - { type: 'nfs4',  src: '{{ sap_mnt }}/sapmnt{{ sap_sid | upper }}',    path: '/sapmnt/{{ sap_sid | upper }}'      }
@@ -282,7 +276,7 @@
         src:                           "{{ item.src }}"
         path:                          "{{ item.path }}"
         fstype:                        "{{ item.type }}"
-        opts:                          "{{ afs_mnt_options }}"
+        opts:                          "{{ setting_vars_output.results[0]['mnt_options']['afs_mnt_options'] }}"
         state:                         unmounted
       loop:
         - { type: 'nfs4',  src: '{{ sap_mnt }}/sapmnt{{ sap_sid | upper }}',    path: '/sapmnt/{{ sap_sid | upper }}'      }
@@ -299,7 +293,7 @@
         src:                           "{{ item.src }}"
         path:                          "{{ item.path }}"
         fstype:                        "{{ item.type }}"
-        opts:                          "{{ afs_mnt_options }}"
+        opts:                          "{{ setting_vars_output.results[0]['mnt_options']['afs_mnt_options'] }}"
         state:                         mounted
       loop:
         - { type: 'nfs4',  src: '{{ sap_mnt }}/sapmnt{{ sap_sid | upper }}',    path: '/sapmnt/{{ sap_sid | upper }}'      }
@@ -316,7 +310,7 @@
     src:                               "{{ sap_mnt }}/sapmnt{{ item.sid }}"
     path:                              "/sapmnt/{{ item.sid }}"
     fstype:                            'nfs4'
-    opts:                              "{{ afs_mnt_options }}"
+    opts:                              "{{ setting_vars_output.results[0]['mnt_options']['afs_mnt_options'] }}"
     state:                             mounted
   loop:                                "{{ MULTI_SIDS }}"
   when:
@@ -331,7 +325,7 @@
         src:                           "{{ sap_mnt }}/sapmnt{{ sap_sid | upper }}"
         path:                          "/sapmnt/{{ sap_sid | upper }}"
         fstype:                        nfs4
-        opts:                          "{{ afs_mnt_options }}"
+        opts:                          "{{ setting_vars_output.results[0]['mnt_options']['afs_mnt_options'] }}"
         state:                         mounted
   rescue:
     - name:                            "AFS Mount: Pause for 15 seconds"
@@ -342,7 +336,7 @@
         src:                           "{{ sap_mnt }}/sapmnt{{ sap_sid | upper }}"
         path:                          "/sapmnt/{{ sap_sid | upper }}"
         fstype:                        nfs4
-        opts:                          "{{ afs_mnt_options }}"
+        opts:                          "{{ setting_vars_output.results[0]['mnt_options']['afs_mnt_options'] }}"
         state:                         mounted
 
   when:
@@ -380,7 +374,7 @@
         src:                           "{{ item.src }}"
         path:                          "{{ item.path }}"
         fstype:                        "{{ item.type }}"
-        opts:                          "{{ afs_mnt_options }}"
+        opts:                          "{{ setting_vars_output.results[0]['mnt_options']['afs_mnt_options'] }}"
         state:                         mounted
 
       loop:
@@ -400,7 +394,7 @@
       'type':              'trans',
       'temppath':          'saptrans',
       'mount':             '{{ sap_trans }}',
-      'opts':              '{{ afs_mnt_options }}',
+      'opts':              '{{ setting_vars_output.results[0]["mnt_options"]["afs_mnt_options"] }}',
       'path':              '/usr/sap/trans',
       'owner':             "root",
       'permissions':       '0775',