Merge branch 'origin/master' into alexy_logging

Author: elfiesmelfie

ci/run_playbooks.yml

@@ -39,7 +39,7 @@
         - name: Patch the openstackversions to use the master containers for aodh and heat
           ansible.builtin.shell:
             cmd: |
-              oc patch openstackversions openstack-galera-network-isolation --type merge --patch-file ci/patch-openstack-versions.yaml
+              oc patch openstackversions controlplane  --type merge --patch-file ci/patch-openstack-versions.yaml
             chdir: "{{ fvt_dir }}"
           when: "{{ patch_openstackversions | bool }}"
           tags:
@@ -81,6 +81,13 @@
             content: "{{ output.stdout }}"
             dest: "{{ logs_dir }}/ansible_run.log"
 
+
+    - name: Revert the version update
+      ansible.builtin.shell:
+        cmd: |
+          oc patch  openstackversions controlplane  --type json -p='[{"op": "replace", "path": "/spec/customContainerImages", "value": {} }]'
+      when: "{{ patch_openstackversions | bool }}"
+
     - name: Include report result 
       ansible.builtin.include_tasks:
         file: report_result.yml

roles/telemetry_autoscaling/tasks/post_teardown.yml

@@ -20,11 +20,4 @@
   ignore_errors: true
   retries: 50
   timeout: 5
-
-  # TODO: Get the name of the openstackversions object.
-  # TODO: Work on getting the patches into kustomize format, so that we can use them by passing into the job vars, and can skip setup.
-  # This is so we can test it locally.
-- name: Revert the version update
-  ansible.builtin.shell:
-    cmd: |
-      oc patch openstackversions openstack-galera-network-isolation --type json -p='[{"op": "replace", "path": "/spec/customContainerImages", "value": {} }]'
+