collection: legacy syntax fixes

sap-linuxlab · Jan 10, 2024 · b38e6d1 · b38e6d1
1 parent 0ee7de2
commit b38e6d1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/roles/sap_control/tasks/functions/restart_sapstartsrv.yml b/roles/sap_control/tasks/functions/restart_sapstartsrv.yml
@@ -13,7 +13,7 @@
 # Stop sapstartsrv
 - name: SAPstartsrv - Stop sapstartsrv {{ passed_sap_sid }}-{{ passed_sap_nr }}
   ansible.builtin.shell: |
-    source ~/.profile && cdexe; sapcontrol -nr {{ passed_sap_nr }} -function StopService {{ passed_sap_sid }}
+    source ~/.profile ; sapcontrol -nr {{ passed_sap_nr }} -function StopService {{ passed_sap_sid }}
   args:
     executable: /bin/bash
   become: true
@@ -25,7 +25,7 @@
 # Start sapstartsrv
 - name: SAPstartsrv - Start sapstartsrv {{ passed_sap_sid }}-{{ passed_sap_nr }}
   ansible.builtin.shell: |
-    source ~/.profile && cdexe; sapcontrol -nr {{ passed_sap_nr }} -function StartService {{ passed_sap_sid }}
+    source ~/.profile ; sapcontrol -nr {{ passed_sap_nr }} -function StartService {{ passed_sap_sid }}
   args:
     executable: /bin/bash
   become: true

diff --git a/roles/sap_control/tasks/functions/sapstartsrv.yml b/roles/sap_control/tasks/functions/sapstartsrv.yml
@@ -6,7 +6,7 @@
 # Check sapstartsrv
 - name: SAPstartsrv - Check sapstartsrv
   ansible.builtin.shell: |
-    source ~/.profile && cdexe; sapcontrol -nr {{ passed_sap_nr }} -function GetSystemInstanceList
+    source ~/.profile ; sapcontrol -nr {{ passed_sap_nr }} -function GetSystemInstanceList
   args:
     executable: /bin/bash
   become: true

diff --git a/roles/sap_control/tasks/sapcontrol.yml b/roles/sap_control/tasks/sapcontrol.yml
@@ -17,7 +17,6 @@
     source ~/.profile && sapcontrol -nr {{ passed_sap_nr }} -function {{ vars['sap_control_' + funct_type] }}
   args:
     executable: /bin/bash
-    warn: false
   become: true
   become_user: "{{ passed_sap_sid | lower }}adm"
   register: sapcontrol_status

diff --git a/roles/sap_profile_update/tasks/main.yml b/roles/sap_profile_update/tasks/main.yml
@@ -3,14 +3,14 @@
 - name: SAP Profile Update - Get Instance Profile
   ansible.builtin.shell: |
     set -o pipefail
-    source ~/.profile && cdexe; sapcontrol -nr {{ sap_update_profile_instance_nr }} -function ParameterValue SAPPROFILE | grep profile
+    source ~/.profile ; sapcontrol -nr {{ sap_update_profile_instance_nr }} -function ParameterValue SAPPROFILE | grep profile
   args:
     executable: /bin/bash
   become: true
   become_user: "{{ sap_update_profile_sid | lower }}adm"
   register: get_instance_profile
 
-- name: setup facts
+- name: SAP Profile Update - Setup facts
   ansible.builtin.set_fact:
     sap_update_profile_default_profile_file_path: "/sapmnt/{{ sap_update_profile_sid }}/profile/DEFAULT.PFL"
     sap_update_profile_instance_profile_file_path: "{{ get_instance_profile.stdout }}"

diff --git a/roles/sap_rhsm/tasks/rhsm_register.yml b/roles/sap_rhsm/tasks/rhsm_register.yml
@@ -42,8 +42,6 @@
 
     - name: Yum clean all
       ansible.builtin.command: "yum clean all"
-      args:
-        warn: false
 
     - name: Yum search sap-
       ansible.builtin.command: "yum -y search sap-"