[pull] master from oravirt:master

.github/workflows/ansible-lint.yml

@@ -18,4 +18,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Run ansible-lint
-        uses: ansible/ansible-lint@v6.22.1
+        uses: ansible/ansible-lint@v24.7.0

.pre-commit-config.yaml

@@ -50,7 +50,7 @@ repos:
           - ansible-core
 
   - repo: https://github.com/ansible-community/ansible-lint.git
-    rev: v6.22.1
+    rev: v24.7.0
     hooks:
       - id: ansible-lint
         entry: ansible-lint --force-color -p

changelogs/fragments/ansible-lint.yml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - "ansible-lint: Update ansible-lint to 24.7.0 (oravirt#471)"

changelogs/fragments/ansible-lint2.yml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - "ansible-lint: fqcn[action-core] for ansible.builtin.yum due to OL7 compatibility (oravirt#471)"

changelogs/fragments/builder.yml

@@ -0,0 +1,4 @@
+---
+minor_changes:
+  - "ansible-builder: moved to new base image (oravirt#470)"
+  - "tools: changed requirements_dev.txt for venv (oravirt#470)"

changelogs/fragments/ocenv.yml

@@ -0,0 +1,3 @@
+---
+minor_changes:
+  - "ocenv: version 2024-08-23 of ocenv environment script (oravirt#468)"

changelogs/fragments/orahost_meta_gi.yml

@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - "orahost_meta: Added default for oracle_install_option_gi to limit dependency to other roles (oravirt#467)"

example/rac/ansible/playbooks/os_racattack.yml

@@ -28,7 +28,7 @@
           {% endfor %}
 
     - name: List availible updates
-      ansible.builtin.yum:
+      ansible.builtin.yum:  # noqa fqcn[action-core]
         list: updates
         update_cache: true
         security: true
@@ -40,7 +40,7 @@
         var: yum_update_list_res.results | map(attribute='name') | sort
 
     - name: Update all OS packages to latest
-      ansible.builtin.yum:  # noqa: package-latest
+      ansible.builtin.yum:  # noqa: package-latest fqcn[action-core]
         name: '*'
         state: latest
         lock_timeout: 600

execution-environment.yml

@@ -3,10 +3,18 @@ version: 3
 
 images:
   base_image:
-    name: ghcr.io/ansible/creator-ee:v24.2.0
-
-options:
-    package_manager_path: /usr/bin/microdnf
+    name: quay.io/centos/centos:stream9
 
 dependencies:
-  python: requirements.txt
+  python_interpreter:
+    package_system: python3.11
+    python_path: /usr/bin/python3.11
+  system:
+    - iputils
+    - openssh-clients
+    - less
+  ansible_core:
+    package_pip: ansible-core<2.17.0
+  ansible_runner:
+    package_pip: ansible-runner==2.4.0
+  python: tools/dev/requirements_dev.txt

roles/common/tasks/RedHat.yml

@@ -11,7 +11,7 @@
         key: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ ansible_distribution_major_version }}
 
     - name: Add EPEL Repo
-      ansible.builtin.yum:
+      ansible.builtin.yum:  # noqa fqcn[action-core]
         name: "{{ _common_epel_rpm }}"
         state: installed
 
@@ -43,7 +43,7 @@
     - olrepo
 
 - name: Install common packages OL/RHEL
-  ansible.builtin.yum:
+  ansible.builtin.yum:  # noqa fqcn[action-core]
     name: "{{ common_packages }}"
     state: installed
   when:

roles/orahost/tasks/RedHat.yml

@@ -1,7 +1,7 @@
 ---
 # OL8/RHEL8 has all needed RPMs in orahost role!
 - name: Install packages required by Oracle on OL/RHEL version 6,7,8,9
-  ansible.builtin.yum:
+  ansible.builtin.yum:  # noqa fqcn[action-core]
     name: "{{ oracle_packages }}"
     state: installed
     enablerepo: "{{ extrarepos_enabled | default(omit, True) }}"
@@ -13,7 +13,7 @@
   notify: Reboot concerning package updates
 
 - name: Install packages required by Oracle for ASMlib on OL/RHEL
-  ansible.builtin.yum:
+  ansible.builtin.yum:  # noqa fqcn[action-core]
     name: "{{ oracle_asm_packages }}"
     state: installed
     enablerepo: "{{ extrarepos_enabled | default(omit, True) }}"
@@ -30,7 +30,7 @@
     - disable_firewall
   block:
     - name: Check if firewall is installed
-      ansible.builtin.yum:
+      ansible.builtin.yum:  # noqa fqcn[action-core]
         list: "{{ firewall_service }}"
         disablerepo: "*"
       tags: iptables,firewalld

roles/orahost_meta/tasks/assert_cluster.yml

@@ -6,7 +6,7 @@
   block:
     - name: assert orasw_meta_cluster_hostgroup (GI enabled)
       when:
-        - oracle_install_option_gi == 'CRS_CONFIG'
+        - oracle_install_option_gi | default('') == 'CRS_CONFIG'
       block:
         - name: assert orasw_meta_cluster_hostgroup
           ansible.builtin.assert:

roles/orahost_meta/tasks/main.yml

@@ -9,7 +9,7 @@
   ansible.builtin.set_fact:
     _orasw_meta_primary_node: true
   when:
-    - oracle_install_option_gi != 'CRS_CONFIG'
+    - oracle_install_option_gi | default('') != 'CRS_CONFIG'
 
 # RAC:
 #   1st Node:
@@ -20,7 +20,7 @@
   ansible.builtin.set_fact:
     _orasw_meta_primary_node: "{{ groups[orasw_meta_cluster_hostgroup][0] == inventory_hostname }}"
   when:
-    - oracle_install_option_gi == 'CRS_CONFIG'
+    - oracle_install_option_gi | default('') == 'CRS_CONFIG'
 
 ### Determine kernel.panic according to Doc ID 2821641.1
 # kdump state cannot savely be retrieved from service_facts

roles/oraswgi_install/tasks/12.1.0.1.yml

@@ -26,7 +26,7 @@
 
 - name: install_home_gi | Install cvuqdisk rpm
   # noqa ignore-errors
-  ansible.builtin.yum:
+  ansible.builtin.yum:  # noqa fqcn[action-core]
     name: "{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}"
     state: present
   when: _oraswgi_meta_configure_cluster

roles/oraswgi_install/tasks/12.1.0.2.yml

@@ -27,7 +27,7 @@
   when: oracle_home_gi not in checkgiinstall.stdout and oracle_install_version_gi == item.version and not oracle_sw_copy and oracle_sw_unpack
 
 - name: install_home_gi | Install cvuqdisk rpm
-  ansible.builtin.yum:
+  ansible.builtin.yum:  # noqa fqcn[action-core]
     name: "{{ oracle_stage_install }}/{{ oracle_install_version_gi }}/grid/rpm/{{ cvuqdisk_rpm }}"
     state: present
   # noqa ignore-errors

roles/oraswgi_install/tasks/12.2.0.1.yml

@@ -49,7 +49,7 @@
     - _orasw_meta_primary_node | bool
 
 - name: install_home_gi | Install cvuqdisk rpm
-  ansible.builtin.yum:
+  ansible.builtin.yum:  # noqa fqcn[action-core]
     name: "{{ oracle_home_gi }}/cv/rpm/{{ cvuqdisk_rpm }}"
     state: present
   # noqa ignore-errors

roles/oraswgi_install/tasks/18.3.0.0.yml

@@ -53,7 +53,7 @@
     - _orasw_meta_primary_node | bool
 
 - name: install_home_gi | Install cvuqdisk rpm
-  ansible.builtin.yum:
+  ansible.builtin.yum:  # noqa fqcn[action-core]
     name: "{{ oracle_home_gi }}/cv/rpm/{{ cvuqdisk_rpm }}"
     state: present
   # noqa ignore-errors

roles/oraswgi_install/tasks/19.3.0.0.yml

@@ -98,7 +98,7 @@
       tags: cvuqdisk
 
     - name: include 19c/21c | Install cvuqdisk rpm
-      ansible.builtin.yum:
+      ansible.builtin.yum:  # noqa fqcn[action-core]
         name: "{{ oracle_rsp_stage }}/{{ cvuqdisk_rpm }}"
         state: present
         disable_gpg_check: true

tools/ansible/requirements_ansible.txt

@@ -0,0 +1 @@
+../dev/requirements_dev.txt

tools/dev/requirements_dev.txt

@@ -12,14 +12,16 @@
 # . ~/venv/ansible-oracle/bin/activate
 # pip --require-virtualenv -v install -r tools/dev/requirements_dev.txt
 #
-ansible-lint==6.22.1
-ansible-navigator==3.4.0
+ansible-core<2.17
+ansible-builder==3.1.0
+ansible-lint==24.7.0
+ansible-navigator==24.8.0
 pre-commit==3.4.0
 
 # docker is needed by molecule
 docker==6.1.3
-molecule==5.1.0
-molecule-plugins[docker]==23.5.0
+molecule==24.8.0
+molecule-plugins[docker]==23.5.3
 
 # xmltodict is needed for ansible.utils.keep_keys
 xmltodict==0.13.0