Merge pull request #447 from eifrach/PPC_for_older_OCP

fix issue where performance profile generator fails

Author: openshift-merge-bot[bot]

playbooks/compute/delete_old_clusters.yml

@@ -14,7 +14,7 @@
         password: "{{ hostvars[item].bmc_password }}"
       when: hostvars[item].vendor | default('') | lower != 'kvm'
       loop: "{{ groups['nodes'] | default([]) }}"
-      
+
     - name: Get all Running VMs
       community.libvirt.virt:
         command: list_vms

playbooks/compute/roles/configurecluster/defaults/main.yml

@@ -13,3 +13,4 @@ day0_installation: false
 mcp_wait_retries: 180
 mcp_wait_delay: 30
 ppc_image: "registry.redhat.io/openshift4/ose-cluster-node-tuning-rhel9-operator:v4.21"
+ppc_image_rhel8: "registry.redhat.io/openshift4/ose-cluster-node-tuning-operator:v4.12"

playbooks/compute/roles/configurecluster/tasks/ppc.yml

@@ -22,10 +22,20 @@
     ocp_version_major: "{{ api_version.resources[0].status.desired.version.split('.')[0] }}"
     ocp_version_minor: "{{ api_version.resources[0].status.desired.version.split('.')[1] }}"
 
+- name: Set performance profile creator
+  ansible.builtin.set_fact:
+    nto_ppc_image: "{{ ppc_image }}"
+
+- name: Set performance profile creator for older OCP
+  ansible.builtin.set_fact:
+    nto_ppc_image: "{{ ppc_image_rhel8 }}"
+  when:
+    - (ocp_version_major ~ '.' ~ ocp_version_minor) is version('4.19', '<')
+
 - name: Generate Performance Profile using PPC container
   containers.podman.podman_container:
     name: ppc_tool
-    image: "{{ ppc_image }}"
+    image: "{{ nto_ppc_image }}"
     rm: true
     entrypoint: performance-profile-creator
     detach: false
@@ -40,7 +50,7 @@
   register: ppc_output
 
 - name: Save generated profile to file
-  copy:
+  ansible.builtin.copy:
     content: "{{ ppc_output.stdout }}"
     dest: "/tmp/tmp_ppc.yaml"
     mode: '0664'
@@ -51,6 +61,6 @@
   register: profile_file
 
 - name: Extract CPU settings
-  set_fact:
+  ansible.builtin.set_fact:
     cpu_isolated: "{{ (profile_file.content | b64decode | from_yaml).spec.cpu.isolated }}"
     cpu_reserved: "{{ (profile_file.content | b64decode | from_yaml).spec.cpu.reserved }}"

playbooks/compute/roles/nrop_testing/defaults/main.yml

@@ -27,6 +27,7 @@ rt_kernel: "true"
 must_gather_path: "/tmp/must-gather-data"
 performance_profile: "performance-profile.yaml"
 ppc_image: "registry.redhat.io/openshift4/ose-cluster-node-tuning-rhel9-operator:v4.21"
+ppc_image_rhel8: "registry.redhat.io/openshift4/ose-cluster-node-tuning-operator:v4.12"
 
 # devices
 device_t1: tty1

playbooks/compute/roles/nrop_testing/tasks/performance_profile.yml

@@ -10,10 +10,20 @@
   register: must_gather
   changed_when: must_gather.rc == 0
 
+- name: Set performance profile creator
+  ansible.builtin.set_fact:
+    nrop_ppc_image: "{{ ppc_image }}"
+
+- name: Set performance profile creator for older OCP
+  ansible.builtin.set_fact:
+    nrop_ppc_image: "{{ ppc_image_rhel8 }}"
+  when:
+    - (ocp_version_major ~ '.' ~ ocp_version_minor) is version('4.19', '<')
+
 - name: Generate Performance Profile using PPC container
   containers.podman.podman_container:
     name: ppc_tool
-    image: "{{ ppc_image }}"
+    image: "{{ nrop_ppc_image }}"
     rm: true
     entrypoint: performance-profile-creator
     detach: false