oraswgi_install: Next refactoring of role for RAC

Author: Rendanic

changelogs/fragments/oraswgi_install_refactor.yml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - "oraswgi_install: Next refactoring of role for RAC ()"

roles/oraswgi_install/README.md

@@ -271,8 +271,6 @@ run_configtoolallcommand: true
 
 **_nfsumountdb_**
 
-**_olsnodes_**
-
 **_opatchls_**
 
 **_oragridinstall_**
@@ -297,6 +295,12 @@ run_configtoolallcommand: true
 
 - (bug): oracle_vip is not flexible enough.
 - (bug): oracle_ic_net will be removed in the future
+- (bug): ConfigTools should not depend on olr.loc...
+- (bug): ConfigTools should not depend on olr.loc...
+- (information): add selectattr to asm_diskgroups
+- (information): Check if path for patches is ok with patch_id/patch_id
+- (information): add selectattr to asm_diskgroups
+- (information): Check if path for patches is ok with patch_id/patch_id
 
 ## Dependencies
 

roles/oraswgi_install/tasks/19.3.0.0.yml

@@ -2,21 +2,22 @@
 # IMPORTANT !!!
 # This file is shared with 21.3.0.0.yml via symbolic link.
 #
-- name: install_home_gi
+# execute when Home is not registered in oraInventory
+- name: include 19c/21c | install_home_gi
   tags:
     - oragridswunpack
   when:
     - oracle_home_gi not in checkgiinstall.stdout
   block:
-    - name: Info
+    - name: include 19c/21c | Info
       ansible.builtin.debug:
         msg:
-          - "install_home_gi | Start Extract files to ORACLE_HOME (gi)"
+          - "Start Extract files to ORACLE_HOME (gi)"
           - "oracle_home_gi: {{ oracle_home_gi }}"
       when:
         - _orasw_meta_primary_node | bool
 
-    - name: install_home_gi | Extract files to ORACLE_HOME (gi)
+    - name: include 19c/21c | Extract files to ORACLE_HOME (gi)
       ansible.builtin.unarchive:
         src: "{{ _oraswgi_install_oracle_gi_image }}"
         dest: "{{ oracle_home_gi }}"
@@ -31,15 +32,16 @@
       when:
         - _orasw_meta_primary_node | bool
 
-    - name: install_home_gi | Copy Patches for -applyRU when version >=19c
+    - name: include 19c/21c | Copy Patches for -applyRU when version >=19c
       ansible.builtin.import_role:
         name: oraswgi_manage_patches
       when:
         - patch_before_rootsh
         - oracle_home_gi not in checkgiinstall.stdout
         - oracle_install_version_gi is version(19, '>=')
+        - apply_patches_gi
 
-- name: install_home_gi | Check for file GridSetup.sh
+- name: include 19c/21c | Check for file GridSetup.sh
   ansible.builtin.stat:
     path: "{{ oracle_home_gi }}/gridSetup.sh"
   register: stat_gridsetup_result
@@ -48,27 +50,25 @@
   when:
     - _orasw_meta_primary_node | bool
 
-- name: install_home_gi | State of GridSetup.sh
+- name: include 19c/21c | State of GridSetup.sh
   ansible.builtin.assert:
     quiet: true
-    that: "stat_gridsetup_result.stat.exists == True"
+    that: stat_gridsetup_result.stat.exists | bool
     msg: "Cannot find {{ oracle_home_gi }}/gridSetup.sh }}"
   when:
     - _orasw_meta_primary_node | bool
 
-- name: check for existing cvuqdisk_rpm
+- name: include 19c/21c | check for existing cvuqdisk_rpm
   ansible.builtin.stat:
     path: "{{ oracle_home_gi }}/cv/rpm/{{ cvuqdisk_rpm }}"
   register: statcvuqdisk
-  when:
-    - _orasw_meta_primary_node | bool
   tags: cvuqdisk
 
 # Oracle Restart + ASMFD
 # => cvuqdisk is mandatory
-- name: When _oraswgi_meta_configure_cluster
+- name: include 19c/21c | When _oraswgi_meta_configure_cluster
   when:
-    - (_oraswgi_meta_configure_cluster and hostvars[cluster_master]['statcvuqdisk']['stat']['exists'])
+    - (_oraswgi_meta_configure_cluster and hostvars[cluster_master]['statcvuqdisk']['stat']['exists'] | default(false))
       or
       (not _oraswgi_meta_configure_cluster and device_persistence == 'asmfd')
   tags: cvuqdisk
@@ -77,7 +77,7 @@
     # synchronize didn't work on all environments...
     # => fetch to ansible controller
     # => copy to nodes
-    - name: install_home_gi | copy cvuqdisk to ansible controller
+    - name: include 19c/21c | copy cvuqdisk to ansible controller
       ansible.builtin.fetch:
         src: "{{ oracle_home_gi }}/cv/rpm/{{ cvuqdisk_rpm }}"
         dest: /tmp
@@ -88,21 +88,22 @@
         - statcvuqdisk.stat.exists
       tags: cvuqdisk
 
-    - name: install_home_gi | copy cvuqdisk to cluster nodes
+    - name: include 19c/21c | copy cvuqdisk to cluster nodes
       ansible.builtin.copy:
         src: "/tmp/{{ cluster_master }}/{{ oracle_home_gi }}/cv/rpm/{{ cvuqdisk_rpm }}"
         dest: "{{ oracle_rsp_stage }}/{{ cvuqdisk_rpm }}"
         mode: 0644
       tags: cvuqdisk
 
-    - name: install_home_gi | Install cvuqdisk rpm
+    - name: include 19c/21c | Install cvuqdisk rpm
       ansible.builtin.yum:
         name: "{{ oracle_rsp_stage }}/{{ cvuqdisk_rpm }}"
         state: present
         disable_gpg_check: true
       tags: cvuqdisk
 
-- name: install_home_gi | Setup response file for install (GI)
+# @todo information: add selectattr to asm_diskgroups
+- name: include 19c/21c | Setup response file for install (GI)
   ansible.builtin.template:
     src: "grid-install.rsp.{{ oracle_install_version_gi }}.j2"
     dest: "{{ oracle_rsp_stage }}/{{ _oraswgi_install_oracle_grid_responsefile }}"
@@ -119,64 +120,76 @@
     - item.diskgroup == oracle_asm_init_dg
     - _orasw_meta_primary_node | bool
 
-- name: install_home_gi | Block for configure Grid Infrastructure
-  when: oracle_home_gi not in checkgiinstall.stdout
+- name: include 19c/21c | Execute cluvfy
+  ansible.builtin.include_tasks: runcluvfy.yml  # noqa name[missing]
+  when:
+    - force_runcluvfy | default(false) or oracle_home_gi not in checkgiinstall.stdout
+  tags: always
+
+# The state for olr.loc is used to check if root.sh has been executed
+- name: Get current state of olr.loc
+  ansible.builtin.stat:
+    path: /etc/oracle/olr.loc
+  register: olrloc
+
+- name: include 19c/21c | Block for configure Grid Infrastructure
+  when: not olrloc.stat.exists | bool
   vars:
     # get 1st opatchauto patch with state=present
+    # @todo information: Check if path for patches is ok with patch_id/patch_id
     __applyruopatchauto: |-
       {{ gi_patches[oracle_install_version_gi]['opatchauto']
         | selectattr('state', 'equalto', 'present') | list | first }}
     __patchru_dir: |-
       {{ oracle_sw_copy | bool | ternary(oracle_stage, oracle_stage_remote) }}/patches/{{ oracle_install_version_gi }}/
-      {{- __applyruopatchauto['path'] | default(__applyruopatchauto['patchid']) }}
+      {{- __applyruopatchauto['path'] | default((__applyruopatchauto['patchid'] | string) + '/' + __applyruopatchauto['patchid'] | string) }}
 
   block:
-    - name: Execute cluvfy
-      ansible.builtin.include_tasks: runcluvfy.yml  # noqa name[missing]
-      when:
-        - force_runcluvfy | default(false) or oracle_home_gi not in checkgiinstall.stdout
-      tags: always
 
-    - name: ASM Filter Driver
+    - name: include 19c/21c | ASM Filter Driver
       ansible.builtin.include_tasks: asmfd.yml
       when:
         - device_persistence == 'asmfd'
       tags:
         - asmfd
 
-    - name: install_home_gi | Check for bundle.xml in patchru_dir
+    - name: include 19c/21c | Check for bundle.xml in patchru_dir
       when:
+        - apply_patches_gi | bool
         - patch_before_rootsh | bool
         - _orasw_meta_primary_node | bool
       block:
         # the ORACLE_HOME is damaged, when gridSetup.sh is started wiith wrong path!
         # => Check for existing file bundle.xml
-        - name: install_home_gi | Check for bundle.xml in {{ __patchru_dir }}
+        - name: include 19c/21c | Check for bundle.xml in {{ __patchru_dir }}
           ansible.builtin.stat:
             path: "{{ __patchru_dir }}/bundle.xml"
           register: __patchru_dir_stat
 
-        - name: install_home_gi | Assert for bundle.xml
+        - name: include 19c/21c | Assert for bundle.xml
           ansible.builtin.assert:
             quiet: true
             that:
               - __patchru_dir_stat.stat.exists
             fail_msg: "bundle.xml not found in {{ __patchru_dir }}"
 
-    - name: install_home_gi | Start Install Grid Infrastructure"
+    - name: include 19c/21c | Start Install Grid Infrastructure"
       ansible.builtin.debug:
         msg:
           - "oracle_home_gi: {{ oracle_home_gi }}"
+          - "apply Patches to GI:           {{ apply_patches_gi }}"
           - "apply RU before configuration: {{ patch_before_rootsh }}"
           - "{{ patch_before_rootsh | bool | ternary('patchru_dir: ' + __patchru_dir, '') }}"
           - "oracle_script_env:   {{ oracle_script_env | default({}) }}"
       when:
         - _orasw_meta_primary_node | bool
 
-    - name: Detail inventory for Grid-Infrastructure
+    - name: include 19c/21c | Detail inventory for Grid-Infrastructure
       ansible.builtin.debug:
         msg:
           - "oracle_cluster_name: {{ oracle_cluster_name }}"
+          - "Nodes in cluster:    {{ groups[orasw_meta_cluster_hostgroup] }}"
+          - "primary_node:        {{ _orasw_meta_primary_node }}"
           - "oracle_scan:         {{ oracle_scan }}"
           - "oracle_scan_port:    {{ oracle_scan_port }}"
           - "oracle_gi_nic_pub:   {{ oracle_gi_nic_pub }}"
@@ -185,12 +198,15 @@
       when:
         - _oraswgi_meta_configure_cluster | bool
 
-    - name: install_home_gi | Install Grid Infrastructure
+    - name: include 19c/21c | Install Grid Infrastructure
       ansible.builtin.command:
         # noqa no-changed-when
         argv: "{{ __argv }}"
       vars:
-        __argv: "{{ __argv1 + (patch_before_rootsh | bool | ternary(__argvru, [])) }}"
+        __argv: >-
+          {{ __argv1
+          + ((patch_before_rootsh | bool and apply_patches_gi | bool)
+          | ternary(__argvru, [])) }}
         __argv1:
           - "{{ oracle_home_gi }}/gridSetup.sh"
           - -responseFile
@@ -211,34 +227,33 @@
       register: giinstall
       failed_when: giinstall.rc not in [0, 6]
 
-    - name: Info
+    - name: include 19c/21c | Info
       ansible.builtin.debug:
         var: giinstall.stdout_lines
       when:
         - giinstall.stdout_lines is defined
         - _orasw_meta_primary_node | bool
 
-- name: install_home_gi | include role oraswgi_manage_patches
+- name: include 19c/21c | include role oraswgi_manage_patches
   ansible.builtin.include_role:
     name: oraswgi_manage_patches
-  when: patch_before_rootsh and apply_patches_gi
-
-- name: ""
   when:
-    - oracle_home_gi not in checkgiinstall.stdout
+    - patch_before_rootsh | bool
+    - apply_patches_gi | bool
+
+- name: include 19c/21c | not olrloc.stat.exists
+  when: not olrloc.stat.exists | bool
   block:  # when: oracle_home_gi not in checkgiinstall.stdout
-    - name: install_home_gi | Run oraInstroot script after installation
+    - name: include 19c/21c | Run oraInstroot script after installation
       ansible.builtin.command: "{{ oracle_inventory_loc }}/orainstRoot.sh"
       environment: "{{ oracle_script_env }}"
       # noqa no-changed-when
       become: true
       tags:
         - runroot
 
-    - ansible.builtin.debug:  # noqa name[missing]
-        msg: "install_home_gi | Start Run root script after installation (Master Node)"
-      when:
-        - _orasw_meta_primary_node | bool
+    - name: include 19c/21c | include_tasks root.sh.yml
+      ansible.builtin.include_tasks: root.sh.yml
 
     - name: install_home_gi | Run root script after installation (Master Node)
       ansible.builtin.command: "{{ oracle_home_gi }}/root.sh"