[ci] Explicitly set the CloudKitty images in oscp

They don't seem to be updated when using openstackversions

Author: elfiesmelfie

ci/configure-cloudkitty.yml

@@ -5,11 +5,25 @@
 # That should get to the point where we have must-gather running so that there is more information available.
 - name: "Create the kustomization for deploying CloudKitty"
   hosts: "{{ cifmw_target_hook_host | default('localhost')  }}"
-  gather_facts: false
+  gather_facts: true
   environment:
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
   tasks:
+    - name: Set the FVT dir
+      ansible.builtin.set_fact:
+        fvt_dir: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/"
+      when: zuul is defined
+
+    - name: Load vars files from FVT
+      ansible.builtin.include_vars:
+        file: "{{ fvt_dir }}/ci/vars/common.yml"
+      when: zuul is defined
+
+    # TODO: Add in a back-up for when zuul is not defined.
+    # This should prefer a passed value, but default to a directory relative to the telemetry-operator repo.
+    # i.e. playbook_dir/../feature-verification-tests
+
     - name: Copy controlplane kustomization
       ansible.builtin.copy:
         dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/90-kustomize-controlplane-cloudkitty.yaml"
@@ -33,12 +47,12 @@
                   # this is needed so the secrets are created for dataplane deployment
                   enabled: true
                   template:
-                    logging:
-                      enabled: false
-                    autoscaling:
-                      enabled: false
                     cloudkitty:
                       enabled: true
+                      cloudKittyAPI:
+                        containerImage: {{ telemetry_registry }}/openstack-cloudkitty-api:{{ telemetry_tag }}
+                      cloudKittyProc:
+                        containerImage: {{ telemetry_registry }}/openstack-cloudkitty-processor:{{ telemetry_tag }}
                       s3StorageConfig:
                         secret:
                           type: "s3"