update builder utility install for 2.3 and ol9

Author: bgraef

olam/provision_builder.yml

@@ -13,15 +13,15 @@
 
   tasks:
 
-    - name: Install Oracle Linux Automation Manager repository
+    - name: Install Oracle Linux Automation Manager repository on OL8
       ansible.builtin.dnf:
         name: oraclelinux-automation-manager-release-el8
         state: present
       retries: 5
       delay: 10
       when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '8'
 
-    - name: Disable Oracle Linux Automation Manager 1.0 repository
+    - name: Disable Oracle Linux Automation Manager 1.0 repository on OL8
       community.general.ini_file:
         path: "/etc/yum.repos.d/oraclelinux-automation-manager-ol8.repo"
         section: ol8_automation
@@ -30,7 +30,7 @@
         mode: '0644'
       when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '8'
 
-    - name: Disable Oracle Linux Automation Manager 2.0 repository
+    - name: Disable Oracle Linux Automation Manager 2.0 repository on OL8
       community.general.ini_file:
         path: "/etc/yum.repos.d/oraclelinux-automation-manager-ol8.repo"
         section: ol8_automation2
@@ -39,16 +39,42 @@
         mode: '0644'
       when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '8'
 
-    - name: Enable Oracle Linux Automation Manager 2.2 repository
+    - name: Disable Oracle Linux Automation Manager 2.2 repository on OL8
       community.general.ini_file:
         path: "/etc/yum.repos.d/oraclelinux-automation-manager-ol8.repo"
         section: ol8_automation2.2
         option: enabled
+        value: "0"
+        mode: '0644'
+      when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '8'
+
+    - name: Enable Oracle Linux Automation Manager 2.3 repository on OL8
+      community.general.ini_file:
+        path: "/etc/yum.repos.d/oraclelinux-automation-manager-ol8.repo"
+        section: ol8_automation2.3
+        option: enabled
         value: "1"
         mode: '0644'
       when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '8'
 
-    - name: Install Oracle Linux Automation Manager Builder Utility
+    - name: Install Oracle Linux Automation Manager repository
+      ansible.builtin.dnf:
+        name: oraclelinux-automation-manager-release-el9
+        state: present
+      retries: 5
+      delay: 10
+      when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '9'
+
+    - name: Enable Oracle Linux Automation Manager 2.3 repository
+      community.general.ini_file:
+        path: "/etc/yum.repos.d/oraclelinux-automation-manager-ol8.repo"
+        section: ol8_automation2.3
+        option: enabled
+        value: "1"
+        mode: '0644'
+      when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '9'
+
+    - name: Install Oracle Linux Automation Manager Builder Utility on OL8
       ansible.builtin.dnf:
         name:
           - python3.11-ansible-builder
@@ -58,9 +84,19 @@
       delay: 10
       when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '8'
 
+    - name: Install Oracle Linux Automation Manager Builder Utility
+      ansible.builtin.dnf:
+        name:
+          - python3.11-ansible-builder
+          - python3.11-pip
+        state: present
+      retries: 5
+      delay: 10
+      when: ansible_distribution == 'OracleLinux' and ansible_distribution_major_version == '9'
+
     - name: Install Ansible Runner using pip
       ansible.builtin.pip:
-        name: ansible-runner
+        name: ansible-navigator
         executable: pip3.11
 
     - name: Create project directory
@@ -125,7 +161,7 @@
         msg: "{{ builder_output.stdout }}"
       when: debug_enabled
 
-    - name: Create runner private_data_dir
+    - name: Create ansible project directory
       ansible.builtin.file:
         path: /tmp/private/project
         state: directory

olam/templates/execution_environment.yml.j2

@@ -1,27 +1,35 @@
 ---
-version: 2
+version: 3
 
 build_arg_defaults:
- ANSIBLE_GALAXY_CLI_COLLECTION_OPTS: "--ignore-certs"
-
-ansible_config: 'ansible.cfg'
+ ANSIBLE_GALAXY_CLI_COLLECTION_OPTS: '--pre --ignore-certs'
 
 dependencies:
+ ansible_runner:
+   package_pip: ansible-runner
  galaxy: requirements.yml
  python: requirements.txt
  system: bindep.txt
 
 images:
  base_image:
-  name: container-registry.oracle.com/oracle_linux_automation_manager/olam-ee:2.2
- builder_image:
-  name: container-registry.oracle.com/oracle_linux_automation_manager/olam-builder:2.2
+{% if ansible_distribution_major_version == '8' %}
+  name: container-registry.oracle.com/oracle_linux_automation_manager/olam-ee:2.3-ol8
+{% endif %}
+{% if ansible_distribution_major_version == '9' %}
+  name: container-registry.oracle.com/oracle_linux_automation_manager/olam-ee:2.3-ol9
+{% endif %}
 
+additional_build_files:
+    - src: ansible.cfg
+      dest: configs 
+    
 additional_build_steps:
-  prepend: |
+  prepend_galaxy:
+    - COPY _build/configs/ansible.cfg /etc/ansible/ansible.cfg
+  prepend_final: |
     RUN whoami
     RUN cat /etc/os-release
-  append:
+  append_final:
     - RUN echo This is a post-install command!
     - RUN ls -la /etc
-

olam/templates/requirements.txt.j2

@@ -1,2 +1,3 @@
-setuptools
-oci>=2.141.1
+requests>=2.4.2
+ovirt-engine-sdk-python>=4.6.2
+oci>=2.155.0

olam/templates/requirements.yml.j2

@@ -1,6 +1,6 @@
 ---
 collections:
-- name: https://github.com/oracle/oci-ansible-collection.git
-  type: git
-  version: master
+- name: oracle.oci
+  version: ">=5.5.0,<6.0.0"
+  type: galaxy
 - name: ovirt.ovirt