Changes to oraswgi-opatch to remove 'master_node' functionality

Author: oravirt

roles/oraswgi-opatch/defaults/main.yml

@@ -1,8 +1,9 @@
 ---
 
-  master_node: true
+  #master_node: true
   role_separation: false
   hostgroup: "{{ group_names[0] }}"
+  cluster_master: "{{play_hosts[0]}}"
   configure_cluster: false
   oracle_psu_apply_gi: true
 
@@ -35,14 +36,25 @@
 
   oracle_hostname: "{{ ansible_fqdn }}"                            # Full (FQDN) name of the host
 
+  # gi_patches:
+  #      12.2.0.1:
+  #           opatchauto:
+  #               - 27468969
+  #           oneoff: []
+  #      12.1.0.2:
+  #           opatchauto:
+  #               - 20485724
+  #           oneoff: []
 
   oracle_sw_image_gi_psu:                                              # Files containing the installation media for Grid Infrastructure
+       - { filename: p27468969_122010_Linux-x86-64.zip, patchid: 27468969, version: 12.2.0.1,  patchversion: 12.2.0.1.180417, description: GI-RU-April-2018 }
        #- { filename: p19392646_121020_Linux-x86-64.zip, patchid: 19392646, version: 12.1.0.2, patchversion: 12.1.0.2.1, description: GI-PSU-Oct-2014 }
        #- { filename: p20485724_121020_Linux-x86-64.zip, patchid: 20485724, version: 12.1.0.2, patchversion: 12.1.0.2.3, description: GI-PSU-Apr-2015 }
        #- { filename: p21523234_121020_Linux-x86-64.zip, patchid: 21523234, version: 12.1.0.2, patchversion: 12.1.0.2.5, description: GI-PSU-Oct-2015 }
        #- { filename: p24412235_121020_Linux-x86-64.zip, patchid: 24412235, version: 12.1.0.2, patchversion: 12.1.0.2.161018, description: GI-PSU-Oct-2016 }
        #- { filename: p24968615_121020_Linux-x86-64.zip, patchid: 24968615, version: 12.1.0.2, patchversion: 12.1.0.2.170117, description: GI-PSU-Jan-2017}
-       - { filename: p25434003_121020_Linux-x86-64.zip, patchid: 25434003, version: 12.1.0.2, patchversion: 12.1.0.2.170418, description: GI-PSU-Apr-2017}
+       #- { filename: p25434003_121020_Linux-x86-64.zip, patchid: 25434003, version: 12.1.0.2, patchversion: 12.1.0.2.170418, description: GI-PSU-Apr-2017}
+       - { filename: p27468957_121020_Linux-x86-64.zip, patchid: 27468957 , version: 12.1.0.2, patchversion: 12.1.0.2.170418, description: GI-PSU-Apr-2018}
        #- { filename: p19380115_112040_Linux-x86-64.zip, patchid: 19380115, version: 11.2.0.4, patchversion: 11.2.0.4.4, description: GI-PSU-Oct-2014 }
        #- { filename: p20485808_112040_Linux-x86-64.zip, patchid: 20485808, version: 11.2.0.4, patchversion: 11.2.0.4.6, description: GI-PSU-Apr-2015 }
        - { filename: p21523375_112040_Linux-x86-64.zip, patchid: 21523375, version: 11.2.0.4, patchversion: 11.2.0.4.8, description: GI-PSU-Oct-2015 }

roles/oraswgi-opatch/tasks/main.yml

@@ -6,7 +6,7 @@
     become_user: "{{ grid_install_user }}"
     with_items: "{{oracle_sw_image_gi_psu}}"
     tags: check_applied_gi_patches
-    when: oracle_psu_apply_gi #and "{{ item.version }}" == "{{ oracle_install_version_gi }}"
+    when: oracle_psu_apply_gi and item.version == oracle_install_version_gi
     register: gi_applied_patches
 
 
@@ -75,7 +75,7 @@
     with_together:
        - "{{oracle_sw_image_gi_psu}}"
        - "{{gi_applied_patches.results}}"
-    when: oracle_psu_apply_gi and item.0.version == oracle_install_version_gi and not item.1.stdout != 0 and not oracle_sw_copy and oracle_sw_unpack
+    when: oracle_psu_apply_gi and item.0.version == oracle_install_version_gi and not oracle_sw_copy and oracle_sw_unpack #and not item.1.stdout != 0
     tags:
       - oragridpsuunpack
 
@@ -113,15 +113,15 @@
   #   tags:
   #     - ocmconfig
 
-  - name: Apply PSU to GI (v12.1) (Master node)
+  - name: Apply PSU to GI (v12.x) (Master node)
     shell: "{{ oracle_home_gi }}/OPatch/opatchauto apply {{ oracle_psu_stage }}/{{ oracle_install_version_gi }}/{{ item.0.patchid }} -oh {{ oracle_home_gi }}" #-ocmrf {{ oracle_psu_stage }}/{{ oracle_install_version_gi }}/ocm.rsp "
     with_together:
        - "{{oracle_sw_image_gi_psu}}"
        - "{{gi_applied_patches.results}}"
     run_once: "{{ configure_cluster}}"
     tags:
       - apply_psu_grid
-    when: oracle_psu_apply_gi and '12.1' in oracle_install_version_gi and item.0.version == oracle_install_version_gi and not item.1.stdout != 0
+    when: oracle_psu_apply_gi and '12.1' in oracle_install_version_gi or '12.2' in oracle_install_version_gi and item.0.version == oracle_install_version_gi #and not item.1.stdout != 0
     register: psuapplym
 
 
@@ -177,7 +177,7 @@
     register: psuapplyo
 
   - debug: var=psuapplyo.stdout_lines
-    when: configure_cluster and inventory_hostname != cluster_master oracle_psu_apply_gi
+    when: configure_cluster and inventory_hostname != cluster_master and oracle_psu_apply_gi and psuapplyo is defined
     tags:
       - psuapplyo