v1.1.0 release

IBM-Cloud · Nov 28, 2023 · 24e08ec · 24e08ec
1 parent 235c0e5
commit 24e08ec
Show file tree

Hide file tree

Showing 381 changed files with 1,609 additions and 9,764 deletions.
diff --git a/README.md b/README.md
diff --git a/schematics/ansible/ansible.cfg → ansible/ansible.cfg b/schematics/ansible/ansible.cfg → ansible/ansible.cfg
diff --git a/schematics/ansible/ascsclusterinst.yml → ansible/ascsclusterinst.yml b/schematics/ansible/ascsclusterinst.yml → ansible/ascsclusterinst.yml
@@ -9,7 +9,6 @@
         - "fileshares-vars.yml"
         - "hainfra-vars.yml"
         - "dns-vars.yml"
-
   roles:
     - ascsclusterinst
 ...
diff --git a/schematics/ansible/dbinstance.yml → ansible/dbinstance.yml b/schematics/ansible/dbinstance.yml → ansible/dbinstance.yml
@@ -9,7 +9,6 @@
         - "saphana-vars.yml"
         - "hainfra-vars.yml"
         - "dns-vars.yml"
-
   roles:
     - dbinstance
 ...
diff --git a/schematics/ansible/ersclusterinst.yml → ansible/ersclusterinst.yml b/schematics/ansible/ersclusterinst.yml → ansible/ersclusterinst.yml
@@ -9,7 +9,6 @@
         - "fileshares-vars.yml"
         - "hainfra-vars.yml"
         - "dns-vars.yml"
-
   roles:
     - ersclusterinst
 ...
diff --git a/schematics/ansible/hdbclusterprimary.yml → ansible/hdbclusterprimary.yml b/schematics/ansible/hdbclusterprimary.yml → ansible/hdbclusterprimary.yml
@@ -7,6 +7,6 @@
       loop:
         - "saphana-vars.yml"
   roles:
-    - hdbclusterhooks
     - hdbclusterprimary
+    - hdbstatus
 ...
diff --git a/schematics/ansible/hdbclustersetup.yml → ansible/hdbclustersetup.yml b/schematics/ansible/hdbclustersetup.yml → ansible/hdbclustersetup.yml
diff --git a/cli/ansible/hdbclusterprimary.yml → ansible/hdbprimaryhooks.yml b/cli/ansible/hdbclusterprimary.yml → ansible/hdbprimaryhooks.yml
@@ -1,12 +1,12 @@
 ---
-- hosts: all
+- hosts: hdb_iphost1
   gather_facts: true
   pre_tasks:
     - name: Import playbook variables
       include_vars: "{{ item }}"
       loop:
         - "saphana-vars.yml"
   roles:
+    - hsrstatus
     - hdbclusterhooks
-    - hdbclusterprimary
 ...
diff --git a/schematics/ansible/hdbprimaryhsr.yml → ansible/hdbprimaryhsr.yml b/schematics/ansible/hdbprimaryhsr.yml → ansible/hdbprimaryhsr.yml
diff --git a/schematics/ansible/hdbprimaryinst.yml → ansible/hdbprimaryinst.yml b/schematics/ansible/hdbprimaryinst.yml → ansible/hdbprimaryinst.yml
diff --git a/schematics/ansible/hdbprimaryreq.yml → ansible/hdbprimaryreq.yml b/schematics/ansible/hdbprimaryreq.yml → ansible/hdbprimaryreq.yml
@@ -9,6 +9,7 @@
         - "hainfra-vars.yml"
         - "dns-vars.yml"
   roles:
+    - sapbasereq
     - saphanareq
     - clusterreq
 ...
diff --git a/cli/ansible/hdbreplicahsr.yml → ansible/hdbreplicahooks.yml b/cli/ansible/hdbreplicahsr.yml → ansible/hdbreplicahooks.yml
@@ -1,13 +1,11 @@
 ---
-- hosts: all
+- hosts: hdb_iphost2
   gather_facts: true
   pre_tasks:
     - name: Import playbook variables
       include_vars: "{{ item }}"
       loop:
         - "saphana-vars.yml"
-        - "hainfra-vars.yml"
   roles:
-    - saphsrreplica
     - hdbclusterhooks
 ...
diff --git a/schematics/ansible/hdbreplicahsr.yml → ansible/hdbreplicahsr.yml b/schematics/ansible/hdbreplicahsr.yml → ansible/hdbreplicahsr.yml
@@ -9,5 +9,4 @@
         - "hainfra-vars.yml"
   roles:
     - saphsrreplica
-    - hdbclusterhooks
 ...
diff --git a/schematics/ansible/hdbreplicainst.yml → ansible/hdbreplicainst.yml b/schematics/ansible/hdbreplicainst.yml → ansible/hdbreplicainst.yml
diff --git a/schematics/ansible/hdbreplicareq.yml → ansible/hdbreplicareq.yml b/schematics/ansible/hdbreplicareq.yml → ansible/hdbreplicareq.yml
@@ -9,6 +9,7 @@
         - "hainfra-vars.yml"
         - "dns-vars.yml"
   roles:
+    - sapbasereq
     - saphanareq
     - clusterreq
 ...
diff --git a/...e/roles/ascsclusterinst/defaults/main.yml → ...e/roles/ascsclusterinst/defaults/main.yml b/...e/roles/ascsclusterinst/defaults/main.yml → ...e/roles/ascsclusterinst/defaults/main.yml
diff --git a/...les/ascsclusterinst/tasks/install_kit.yml → ...les/ascsclusterinst/tasks/install_kit.yml b/...les/ascsclusterinst/tasks/install_kit.yml → ...les/ascsclusterinst/tasks/install_kit.yml
diff --git a/...ible/roles/ascsclusterinst/tasks/main.yml → ansible/roles/ascsclusterinst/tasks/main.yml b/...ible/roles/ascsclusterinst/tasks/main.yml → ansible/roles/ascsclusterinst/tasks/main.yml
diff --git a/...les/ascsclusterinst/tasks/permissions.yml → ...les/ascsclusterinst/tasks/permissions.yml b/...les/ascsclusterinst/tasks/permissions.yml → ...les/ascsclusterinst/tasks/permissions.yml
diff --git a/.../roles/ascsclusterinst/tasks/sapusers.yml → .../roles/ascsclusterinst/tasks/sapusers.yml b/.../roles/ascsclusterinst/tasks/sapusers.yml → .../roles/ascsclusterinst/tasks/sapusers.yml
diff --git a/ansible/roles/ascsclusterinst/templates/ascsconfig.cfg b/ansible/roles/ascsclusterinst/templates/ascsconfig.cfg
@@ -0,0 +1,21 @@
+NW_Delete_Sapinst_Users.removeUsers = true
+
+NW_GetMasterPassword.masterPwd = {{ sap_main_password }}
+
+NW_GetSidNoProfiles.sid = {{ sap_sid | upper }}
+
+NW_SAPCrypto.SAPCryptoFile = {{ sap_kit }}/sapexe.sar
+
+NW_SCS_Instance.instanceNumber = {{ sap_ascs_instance_number }}
+
+NW_SCS_Instance.scsVirtualHostname = {{ cname_ascs }}
+
+NW_Unpack.sapExeSar = {{ sap_kit }}/sapexe.sar
+
+NW_getFQDN.FQDN = {{ domain_name }}
+
+archives.downloadBasket = {{ sap_kit }}
+
+hostAgent.sapAdmPassword = {{ sap_main_password }}
+
+nwUsers.sidadmPassword = {{ sap_main_password }}
diff --git a/ansible/roles/ascsclusterinst/templates/sapusers.cfg b/ansible/roles/ascsclusterinst/templates/sapusers.cfg
@@ -0,0 +1,15 @@
+NW_Delete_Sapinst_Users.removeUsers = true
+
+NW_Users_Create.sid = {{ sap_sid | upper }}
+
+hostAgent.sapAdmPassword = {{ sap_main_password }}
+
+nwUsers.dbtype = ind
+
+nwUsers.sapadmUID = 1002
+
+nwUsers.sapsysGID = 1002
+
+nwUsers.sidAdmUID = 1001
+
+nwUsers.sidadmPassword = {{ sap_main_password }}
diff --git a/...nsible/roles/clusterreq/defaults/main.yml → ansible/roles/clusterreq/defaults/main.yml b/...nsible/roles/clusterreq/defaults/main.yml → ansible/roles/clusterreq/defaults/main.yml
diff --git a/cli/ansible/roles/clusterreq/tasks/main.yml → ansible/roles/clusterreq/tasks/main.yml b/cli/ansible/roles/clusterreq/tasks/main.yml → ansible/roles/clusterreq/tasks/main.yml
diff --git a/...nsible/roles/dbinstance/defaults/main.yml → ansible/roles/dbinstance/defaults/main.yml b/...nsible/roles/dbinstance/defaults/main.yml → ansible/roles/dbinstance/defaults/main.yml
diff --git a/cli/ansible/roles/dbinstance/tasks/main.yml → ansible/roles/dbinstance/tasks/main.yml b/cli/ansible/roles/dbinstance/tasks/main.yml → ansible/roles/dbinstance/tasks/main.yml
@@ -4,7 +4,7 @@
       src: dbinstance.cfg
       dest: "{{ sap_kit }}/dbinstance.params"
 
-- name: Start SAP NW DB instance installation
+- name: Start SAP DB instance installation
   shell: "{{ sap_kit }}/swpm/sapinst SAPINST_INPUT_PARAMETERS_URL={{ sap_kit }}/dbinstance.params SAPINST_EXECUTE_PRODUCT_ID={{ sap_product_id }} SAPINST_SKIP_DIALOGS=true SAPINST_START_GUISERVER=false"
 
 - name: Remove virtual hostnames to /etc/hosts file

diff --git a/ansible/roles/dbinstance/templates/dbinstance.cfg b/ansible/roles/dbinstance/templates/dbinstance.cfg
@@ -0,0 +1,47 @@
+HDB_Schema_Check_Dialogs.schemaName = SAPHANADB
+
+HDB_Schema_Check_Dialogs.schemaPassword = {{ sap_main_password }}
+
+HDB_Userstore.doNotResolveHostnames = {{ cname_hana }}
+
+NW_Delete_Sapinst_Users.removeUsers = true
+
+NW_GetMasterPassword.masterPwd = {{ sap_main_password }}
+
+NW_HDB_DB.abapSchemaName = SAPHANADB
+
+NW_HDB_DB.abapSchemaPassword = {{ sap_main_password }}
+
+NW_HDB_DBClient.clientPathStrategy = SAPCPE
+
+NW_HDB_getDBInfo.dbhost = {{ cname_hana }}
+
+NW_HDB_getDBInfo.dbsid = {{ hana_sid|upper }}
+
+NW_HDB_getDBInfo.instanceNumber = {{ hana_sysno }}
+
+NW_HDB_getDBInfo.systemDbPassword = {{ hana_main_password }}
+
+NW_HDB_getDBInfo.systemPassword = {{ hana_main_password }}
+
+NW_HDB_getDBInfo.systemid = {{ hana_sid|upper }}
+
+NW_Recovery_Install_HDB.extractLocation = /usr/sap/{{ hana_sid|upper }}/HDB{{ hana_sysno }}/backup/data/DB_{{ hana_sid|upper }}
+
+NW_Recovery_Install_HDB.extractParallelJobs = {{ hdb_concurrent_jobs }}
+
+NW_Recovery_Install_HDB.sidAdmName = {{ hana_sid|lower }}adm
+
+NW_Recovery_Install_HDB.sidAdmPassword = {{ hana_main_password }}
+
+NW_System.installSAPHostAgent = false
+
+NW_Unpack.sapExeDbSar = {{ sap_kit }}/sapexedb.sar
+
+NW_getFQDN.FQDN = {{ domain_name }}
+
+NW_getLoadType.loadType = SAP
+
+NW_readProfileDir.profileDir = /usr/sap/{{ sap_sid|upper }}/SYS/profile
+
+archives.downloadBasket = {{ sap_kit }}
diff --git a/...le/roles/ersclusterinst/defaults/main.yml → ...le/roles/ersclusterinst/defaults/main.yml b/...le/roles/ersclusterinst/defaults/main.yml → ...le/roles/ersclusterinst/defaults/main.yml
diff --git a/...oles/ersclusterinst/tasks/install_kit.yml → ...oles/ersclusterinst/tasks/install_kit.yml b/...oles/ersclusterinst/tasks/install_kit.yml → ...oles/ersclusterinst/tasks/install_kit.yml
diff --git a/...sible/roles/ersclusterinst/tasks/main.yml → ansible/roles/ersclusterinst/tasks/main.yml b/...sible/roles/ersclusterinst/tasks/main.yml → ansible/roles/ersclusterinst/tasks/main.yml
diff --git a/...oles/ersclusterinst/tasks/permissions.yml → ...oles/ersclusterinst/tasks/permissions.yml b/...oles/ersclusterinst/tasks/permissions.yml → ...oles/ersclusterinst/tasks/permissions.yml
diff --git a/...e/roles/ersclusterinst/tasks/sapusers.yml → ...e/roles/ersclusterinst/tasks/sapusers.yml b/...e/roles/ersclusterinst/tasks/sapusers.yml → ...e/roles/ersclusterinst/tasks/sapusers.yml
diff --git a/ansible/roles/ersclusterinst/templates/ersconfig.cfg b/ansible/roles/ersclusterinst/templates/ersconfig.cfg
@@ -0,0 +1,21 @@
+NW_Delete_Sapinst_Users.removeUsers = true
+
+NW_readProfileDir.profileDir = /usr/sap/{{ sap_sid | upper }}/SYS/profile
+
+archives.downloadBasket = {{ sap_kit }}
+
+hostAgent.sapAdmPassword = {{ sap_main_password }}
+
+nwUsers.sapadmUID = 1002
+
+nwUsers.sapsysGID = 1002
+
+nwUsers.sidAdmUID = 1001
+
+nwUsers.sidadmPassword = {{ sap_main_password }}
+
+nw_instance_ers.ersInstanceNumber = {{ sap_ers_instance_number }}
+
+nw_instance_ers.ersVirtualHostname = {{ cname_ers }}
+
+nw_instance_ers.restartSCS = false
diff --git a/ansible/roles/ersclusterinst/templates/sapusers.cfg b/ansible/roles/ersclusterinst/templates/sapusers.cfg
@@ -0,0 +1,15 @@
+NW_Delete_Sapinst_Users.removeUsers = true
+
+NW_Users_Create.sid = {{ sap_sid | upper }}
+
+hostAgent.sapAdmPassword = {{ sap_main_password }}
+
+nwUsers.dbtype = ind
+
+nwUsers.sapadmUID = 1002
+
+nwUsers.sapsysGID = 1002
+
+nwUsers.sidAdmUID = 1001
+
+nwUsers.sidadmPassword = {{ sap_main_password }}
diff --git a/...e/roles/hdbclusterhooks/defaults/main.yml → ...e/roles/hdbclusterhooks/defaults/main.yml b/...e/roles/hdbclusterhooks/defaults/main.yml → ...e/roles/hdbclusterhooks/defaults/main.yml
diff --git a/...ible/roles/hdbclusterhooks/tasks/main.yml → ansible/roles/hdbclusterhooks/tasks/main.yml b/...ible/roles/hdbclusterhooks/tasks/main.yml → ansible/roles/hdbclusterhooks/tasks/main.yml
@@ -16,10 +16,6 @@
     group: sapsys
     mode: 0755
 
-- name: Pause for 15 minutes to allow all started processes to complete
-  ansible.builtin.pause:
-    minutes: 15
-
 - name: Stop HANADB instance
   shell: |
       /usr/sap/{{ hana_sid | upper }}/HDB{{ hana_sysno }}/HDB stop
@@ -48,14 +44,4 @@
   template:
       src: 20-saphana.j2
       dest: /etc/sudoers.d/20-saphana
-
-- name: Start HANADB instance
-  shell: |
-      /usr/sap/{{ hana_sid | upper }}/HDB{{ hana_sysno }}/HDB start
-  args:
-    executable: /bin/bash
-  become: true
-  become_user: "{{ hana_sid | lower }}adm"
-  register: hanadbstart
-  changed_when: "'StartSystem' in hanadbstart.stdout"
 ...
diff --git a/...s/hdbclusterhooks/templates/20-saphana.j2 → ...s/hdbclusterhooks/templates/20-saphana.j2 b/...s/hdbclusterhooks/templates/20-saphana.j2 → ...s/hdbclusterhooks/templates/20-saphana.j2
diff --git a/...roles/hdbclusterprimary/defaults/main.yml → ...roles/hdbclusterprimary/defaults/main.yml b/...roles/hdbclusterprimary/defaults/main.yml → ...roles/hdbclusterprimary/defaults/main.yml
diff --git a/...le/roles/hdbclusterprimary/tasks/main.yml → ...le/roles/hdbclusterprimary/tasks/main.yml b/...le/roles/hdbclusterprimary/tasks/main.yml → ...le/roles/hdbclusterprimary/tasks/main.yml
@@ -1,8 +1,4 @@
 ---
-- name: Pause for 10 minutes to make sure the replication has completed
-  ansible.builtin.pause:
-    minutes: 10
-
 - name: Enable cluster maintenance mode
   shell: |
       pcs property set maintenance-mode=true
@@ -30,12 +26,4 @@
 - name: Disable cluster maintenance mode
   shell: |
       pcs property set maintenance-mode=false
-
-- name: Pause for 10 minutes to make sure the replication has completed
-  ansible.builtin.pause:
-    minutes: 10
-
-- name: Cluster resource Cleanup
-  shell: |
-      pcs resource cleanup SAPHana_{{ hana_sid | upper}}_{{ hana_sysno }}-clone
 ...
diff --git a/...e/roles/hdbclustersetup/defaults/main.yml → ...e/roles/hdbclustersetup/defaults/main.yml b/...e/roles/hdbclustersetup/defaults/main.yml → ...e/roles/hdbclustersetup/defaults/main.yml
diff --git a/...ible/roles/hdbclustersetup/tasks/main.yml → ansible/roles/hdbclustersetup/tasks/main.yml b/...ible/roles/hdbclustersetup/tasks/main.yml → ansible/roles/hdbclustersetup/tasks/main.yml
diff --git a/ansible/roles/hdbstatus/defaults/main.yml b/ansible/roles/hdbstatus/defaults/main.yml
@@ -0,0 +1,7 @@
+---
+hana_db_env: "source /usr/sap/{{ hana_sid | upper }}/home/.sapenv.sh"
+hana_db_status_command: "python /usr/sap/{{ hana_sid | upper }}/HDB{{ hana_sysno }}/exe/python_support/systemOverview.py"
+hana_db_status_ok: "| Services   | All Started     | OK      | Yes                                              |"
+task_retries: 30
+task_delay: 30
+...
diff --git a/ansible/roles/hdbstatus/tasks/main.yml b/ansible/roles/hdbstatus/tasks/main.yml
@@ -0,0 +1,10 @@
+---
+- name: Wait for hdb cluster resource
+  shell: "{{ hana_db_env }} && {{ hana_db_status_command }}"
+  become: true
+  become_user: "{{ hana_sid | lower }}adm"
+  register: hdbstatus
+  until: hana_db_status_ok in hdbstatus.stdout
+  retries: "{{ task_retries }}"
+  delay: "{{ task_delay }}"
+...
diff --git a/ansible/roles/hsrstatus/defaults/main.yml b/ansible/roles/hsrstatus/defaults/main.yml
@@ -0,0 +1,7 @@
+---
+hana_db_env: "source /usr/sap/{{ hana_sid | upper }}/home/.sapenv.sh"
+hana_replication_status_command: "python /usr/sap/{{ hana_sid | upper }}/HDB{{ hana_sysno }}/exe/python_support/systemReplicationStatus.py"
+hana_replication_status_ok: "overall system replication status: ACTIVE"
+task_retries: 30
+task_delay: 30
+...
diff --git a/ansible/roles/hsrstatus/tasks/main.yml b/ansible/roles/hsrstatus/tasks/main.yml
@@ -0,0 +1,12 @@
+---
+- name: Wait for hana system replication to complete
+  shell: "{{ hana_db_env }} && {{ hana_replication_status_command }}"
+  become: true
+  become_user: "{{ hana_sid | lower }}adm"
+  register: hsrstatus
+  until: hana_replication_status_ok in hsrstatus.stdout
+  retries: "{{ task_retries }}"
+  delay: "{{ task_delay }}"
+  ignore_errors: true
+  failed_when: "hsrstatus.rc not in [ 0, 10, 11, 12, 13, 14, 15 ]"
+...
diff --git a/cli/ansible/roles/s4aasfs/defaults/main.yml → ansible/roles/s4aasfs/defaults/main.yml b/cli/ansible/roles/s4aasfs/defaults/main.yml → ansible/roles/s4aasfs/defaults/main.yml
diff --git a/cli/ansible/roles/s4aasfs/tasks/main.yml → ansible/roles/s4aasfs/tasks/main.yml b/cli/ansible/roles/s4aasfs/tasks/main.yml → ansible/roles/s4aasfs/tasks/main.yml
@@ -84,20 +84,6 @@
     state: directory
     mode: 0775
 
-# - name: Make sure the paths are immutable
-#   file:
-#     path: "{{ path }}"
-#     attr: +i
-#   loop: 
-#     - "/sapmnt/{{ sap_sid|upper }}"
-#     - "/usr/sap/trans"
-#     - "/usr/sap/{{ sap_sid|upper }}/SYS"
-#     - "/usr/sap/{{ sap_sid|upper }}/ASCS{{ sap_ascs_instance_number }}"
-#     - "/usr/sap/{{ sap_sid|upper }}/ERS{{ sap_ers_instance_number }}"
-#     - "/usr/sap/{{ sap_sid|upper }}/D{{ sap_aas_instance_number }}"
-#   loop_control:
-#     loop_var: path  
-
 - name: Mount /sapmnt/{{ sap_sid|upper }} and add it to /etc/fstab
   mount:
     path: "/sapmnt/{{ sap_sid|upper }}"

diff --git a/...ansible/roles/s4aasinst/defaults/main.yml → ansible/roles/s4aasinst/defaults/main.yml b/...ansible/roles/s4aasinst/defaults/main.yml → ansible/roles/s4aasinst/defaults/main.yml
diff --git a/cli/ansible/roles/s4aasinst/tasks/main.yml → ansible/roles/s4aasinst/tasks/main.yml b/cli/ansible/roles/s4aasinst/tasks/main.yml → ansible/roles/s4aasinst/tasks/main.yml
diff --git a/ansible/roles/s4aasinst/templates/aasconfig.cfg b/ansible/roles/s4aasinst/templates/aasconfig.cfg
@@ -0,0 +1,29 @@
+HDB_Schema_Check_Dialogs.schemaName = SAPHANADB
+
+HDB_Schema_Check_Dialogs.schemaPassword = {{ sap_main_password }}
+
+HDB_Userstore.doNotResolveHostnames = {{ cname_hana }}
+
+NW_HDB_getDBInfo.dbhost = {{ cname_hana }}
+
+NW_AS.instanceNumber = {{ sap_aas_instance_number }}
+
+NW_DI_Instance.virtualHostname = {{ ansible_hostname }}
+
+NW_Delete_Sapinst_Users.removeUsers = true
+
+NW_GetMasterPassword.masterPwd = {{ sap_main_password }}
+
+NW_HDB_getDBInfo.instanceNumber = {{ hana_sysno }}
+
+NW_System.installSAPHostAgent = false
+
+NW_getLoadType.loadType = SAP
+
+NW_readProfileDir.profileDir = /usr/sap/{{ sap_sid | upper }}/SYS/profile
+
+archives.downloadBasket = {{ sap_kit }}
+
+nwUsers.sapsysGID = 1002
+
+nwUsers.sidAdmUID = 1001
diff --git a/cli/ansible/roles/s4pasfs/defaults/main.yml → ansible/roles/s4pasfs/defaults/main.yml b/cli/ansible/roles/s4pasfs/defaults/main.yml → ansible/roles/s4pasfs/defaults/main.yml
diff --git a/cli/ansible/roles/s4pasfs/tasks/main.yml → ansible/roles/s4pasfs/tasks/main.yml b/cli/ansible/roles/s4pasfs/tasks/main.yml → ansible/roles/s4pasfs/tasks/main.yml
@@ -84,20 +84,6 @@
     state: directory
     mode: 0775
 
-# - name: Make sure the paths are immutable
-#   file:
-#     path: "{{ path }}"
-#     attr: +i
-#   loop: 
-#     - "/sapmnt/{{ sap_sid|upper }}"
-#     - "/usr/sap/trans"
-#     - "/usr/sap/{{ sap_sid|upper }}/SYS"
-#     - "/usr/sap/{{ sap_sid|upper }}/ASCS{{ sap_ascs_instance_number }}"
-#     - "/usr/sap/{{ sap_sid|upper }}/ERS{{ sap_ers_instance_number }}"
-#     - "/usr/sap/{{ sap_sid|upper }}/D{{ sap_ci_instance_number }}"
-#   loop_control:
-#     loop_var: path  
-
 - name: Mount /sapmnt/{{ sap_sid|upper }} and add it to /etc/fstab
   mount:
     path: "/sapmnt/{{ sap_sid|upper }}"

diff --git a/...ansible/roles/s4pasinst/defaults/main.yml → ansible/roles/s4pasinst/defaults/main.yml b/...ansible/roles/s4pasinst/defaults/main.yml → ansible/roles/s4pasinst/defaults/main.yml
diff --git a/cli/ansible/roles/s4pasinst/tasks/main.yml → ansible/roles/s4pasinst/tasks/main.yml b/cli/ansible/roles/s4pasinst/tasks/main.yml → ansible/roles/s4pasinst/tasks/main.yml