Merge pull request #1078 from berndfinger/issue-1077-add-condition-to-asserts-of-ibm-power-tools

sap_*_preconfigure: Assert the presence of the IBM tools only if necessary

Author: berndfinger

roles/sap_general_preconfigure/tasks/RedHat/assert-installation.yml

@@ -168,7 +168,9 @@
     awk '/Name/{n=$NF}/Version/{v=$NF}/Release/{r=$NF}/Description/{printf ("%s\n", n)}'
   register: __sap_general_preconfigure_register_required_ppc64le_packages_assert
   changed_when: false
-  when: ansible_architecture == "ppc64le"
+  when:
+    - ansible_architecture == "ppc64le"
+    - sap_general_preconfigure_install_ibm_power_tools
   ignore_errors: "{{ sap_general_preconfigure_assert_ignore_errors | d(false) }}"
 
 - name: Assert that all required IBM packages are installed
@@ -180,7 +182,9 @@
     - "{{ __sap_general_preconfigure_required_ppc64le }}"
   loop_control:
     loop_var: line_item
-  when: ansible_architecture == "ppc64le"
+  when:
+    - ansible_architecture == "ppc64le"
+    - sap_general_preconfigure_install_ibm_power_tools
   ignore_errors: "{{ sap_general_preconfigure_assert_ignore_errors | d(false) }}"
 
 - name: Minimum required package version check

roles/sap_hana_preconfigure/tasks/RedHat/assert-installation.yml

@@ -89,17 +89,16 @@
 ### # /opt/ibm/lop/configure
 ### # yum -y install ibm-power-managed-rhel7
 ###
-# Reasons for noqa:
-# command-instead-of-module: I need to examine the output of the yum info command.
-# risky-shell-pipe: If a package is not installed, the shell command will fail. But I want the command to
-#   succeed so that the awk command can examine the result.
-- name: Get install status of required IBM packages # noqa command-instead-of-module risky-shell-pipe
+- name: Get install status of required IBM packages
   ansible.builtin.shell: |
-    yum info installed {{ __sap_hana_preconfigure_required_ppc64le | map('quote') | join(' ') }} |
+    set -o pipefail && yum info installed {{ __sap_hana_preconfigure_required_ppc64le | map('quote') | join(' ') }} |
     awk '/Name/{n=$NF}/Version/{v=$NF}/Release/{r=$NF}/Description/{printf ("%s\n", n)}'
   register: __sap_hana_preconfigure_register_required_ppc64le_packages_assert
-  changed_when: no
-  when: ansible_architecture == "ppc64le"
+  changed_when: false
+  when:
+    - ansible_architecture == "ppc64le"
+    - sap_general_preconfigure_install_ibm_power_tools
+  ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors | d(false) }}"
 
 - name: Assert that all required IBM packages are installed
   ansible.builtin.assert:
@@ -110,7 +109,9 @@
     - "{{ __sap_hana_preconfigure_required_ppc64le }}"
   loop_control:
     loop_var: line_item
-  when: ansible_architecture == "ppc64le"
+  when:
+    - ansible_architecture == "ppc64le"
+    - sap_general_preconfigure_install_ibm_power_tools
   ignore_errors: "{{ sap_hana_preconfigure_assert_ignore_errors | d(false) }}"
 
 - name: Minimum required package version check