From fd706f7018ac80784638d668420b7f373046a1ab Mon Sep 17 00:00:00 2001 From: Bernd Finger Date: Fri, 29 Sep 2023 15:28:14 +0200 Subject: [PATCH] fix remaining issues of #484 --- roles/sap_swpm/tasks/pre_install.yml | 2 +- .../install_type/ha_maint_plan_stack_install.yml | 8 ++++---- .../pre_install/install_type/maint_plan_stack_install.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/sap_swpm/tasks/pre_install.yml b/roles/sap_swpm/tasks/pre_install.yml index 3e9c3ed7c..7e0cb7a6f 100644 --- 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 index b870fe719..9995effc0 100644 --- 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: '([A-Z][0-9])\w' replace: '{{ 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 index bd48c68a7..3c33b3265 100644 --- 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: '([A-Z][0-9])\w' replace: '{{ sap_swpm_sid | upper }}'