Merge pull request #489 from berndfinger/issue-484b

fix remaining issues of #484
sap-linuxlab · Sep 29, 2023 · 41da358 · 41da358
2 parents d5b8595 + fd706f7
commit 41da358
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/roles/sap_swpm/tasks/pre_install.yml b/roles/sap_swpm/tasks/pre_install.yml
@@ -62,7 +62,7 @@
       - " WEBDISP    -   {{ sap_swpm_web_dispatcher_path }}/{{ sap_swpm_web_dispatcher_file_name }} "
       - " SAPCAR     -   {{ sap_swpm_sapcar_path }}/{{ sap_swpm_sapcar_file_name }} "
       - " SWPM       -   {{ sap_swpm_swpm_path }}/{{ sap_swpm_swpm_sar_file_name }} "
-      - " MP Stack   -   {{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace ('//*', '/') }}"
+      - " MP Stack   -   {{ (sap_swpm_mp_stack_path | d('', true) + '/' + sap_swpm_mp_stack_file_name | d('', true)) | regex_replace('//*', '/') }}"
       - " Backup     -   {{ sap_swpm_backup_location }} "
 
 - name: SAP SWPM - Installation Process

diff --git a/roles/sap_swpm/tasks/pre_install/install_type/ha_maint_plan_stack_install.yml b/roles/sap_swpm/tasks/pre_install/install_type/ha_maint_plan_stack_install.yml
@@ -43,20 +43,20 @@
 
 - name: SAP SWPM Pre Install - MP Stack XML - Show File and Path
   ansible.builtin.debug:
-    msg: "SAP Maintenance Planner Stack XML is {{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace ('//*', '/') }}"
+    msg: "SAP Maintenance Planner Stack XML is {{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace('//*', '/') }}"
 
 - name: SAP SWPM Pre Install - MP Stack XML - Set fact for SWPM injection
   ansible.builtin.set_fact:
-    sap_swpm_swpm_command_mp_stack: "SAPINST_STACK_XML={{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace ('//*', '/') }}"
+    sap_swpm_swpm_command_mp_stack: "SAPINST_STACK_XML={{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace('//*', '/') }}"
 
 - name: SAP SWPM Pre Install - MP Stack XML - Ensure (1 of 2) SAP System ID is correct inside SAP Maintenance Plan Stack XML
   ansible.builtin.replace:
-    path: "{{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace ('//*', '/') }}"
+    path: "{{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace('//*', '/') }}"
     regexp: '<constraint name="sid" value="([A-Z][0-9])\w"'
     replace: '<constraint name="sid" value="{{ sap_swpm_sid | upper }}"'
 
 - name: SAP SWPM Pre Install - MP Stack XML - Ensure (2 of 2) SAP System ID is correct inside SAP Maintenance Plan Stack XML
   ansible.builtin.replace:
-    path: "{{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace ('//*', '/') }}"
+    path: "{{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace('//*', '/') }}"
     regexp: '<sid>([A-Z][0-9])\w'
     replace: '<sid>{{ sap_swpm_sid | upper }}'
diff --git a/roles/sap_swpm/tasks/pre_install/install_type/maint_plan_stack_install.yml b/roles/sap_swpm/tasks/pre_install/install_type/maint_plan_stack_install.yml
@@ -28,20 +28,20 @@
 
 - name: SAP SWPM Pre Install - MP Stack XML - Show File and Path
   ansible.builtin.debug:
-    msg: "SAP Maintenance Planner Stack XML is {{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace ('//*', '/') }}"
+    msg: "SAP Maintenance Planner Stack XML is {{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace('//*', '/') }}"
 
 - name: SAP SWPM Pre Install - MP Stack XML - Set fact for SWPM injection
   ansible.builtin.set_fact:
-    sap_swpm_swpm_command_mp_stack: "SAPINST_STACK_XML={{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace ('//*', '/') }}"
+    sap_swpm_swpm_command_mp_stack: "SAPINST_STACK_XML={{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace('//*', '/') }}"
 
 - name: SAP SWPM Pre Install - MP Stack XML - Ensure (1 of 2) SAP System ID is correct inside SAP Maintenance Plan Stack XML
   ansible.builtin.replace:
-    path: "{{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace ('//*', '/') }}"
+    path: "{{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace('//*', '/') }}"
     regexp: '<constraint name="sid" value="([A-Z][0-9])\w"'
     replace: '<constraint name="sid" value="{{ sap_swpm_sid | upper }}"'
 
 - name: SAP SWPM Pre Install - MP Stack XML - Ensure (2 of 2) SAP System ID is correct inside SAP Maintenance Plan Stack XML
   ansible.builtin.replace:
-    path: "{{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace ('//*', '/') }}"
+    path: "{{ (sap_swpm_mp_stack_path + '/' + sap_swpm_mp_stack_file_name) | regex_replace('//*', '/') }}"
     regexp: '<sid>([A-Z][0-9])\w'
     replace: '<sid>{{ sap_swpm_sid | upper }}'