From bb90c9c1a5950abcf84b6bf9ec78ba0b55f16c9a Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Thu, 21 Aug 2025 09:53:53 -0500
Subject: [PATCH] Add CloudKitty image

Change-Id: I203b4856d14e67dd654467f42d282dd5e2b5fc4c
Signed-off-by: Vladimir Kozhukalov <kozhukalov@gmail.com>
---
 playbooks/vars.yaml              | 19 +++++++++++++++++++
 playbooks/vars_2024.1.yaml       |  1 +
 playbooks/vars_2024.2.yaml       |  1 +
 playbooks/vars_2025.1_jammy.yaml |  1 +
 playbooks/vars_2025.1_noble.yaml |  1 +
 playbooks/vars_master_jammy.yaml |  1 +
 playbooks/vars_master_noble.yaml |  1 +
 7 files changed, 25 insertions(+)

diff --git a/playbooks/vars.yaml b/playbooks/vars.yaml
index 110dcb36..813d4fa1 100644
--- a/playbooks/vars.yaml
+++ b/playbooks/vars.yaml
@@ -91,6 +91,23 @@ cinder_image:
     - "KEEP_ALL_WHEELS=yes"
     - "APT_MIRROR='{{ apt_mirror }}'"
 
+cloudkitty_image:
+  context: "."
+  dockerfile: "Dockerfile"
+  container_filename: "Dockerfile"
+  target: "project"
+  registry: "{{ image_registry.host }}"
+  repository: "{{ image_registry.host }}/{{ image_registry.org }}/cinder"
+  tags: *tags
+  build_args:
+    - "FROM='base:{{ image_tag }}'"
+    - "PROJECT='cloudkitty'"
+    - "PROJECT_REF={{ openstack_release }}"
+    - "PROFILES='fluent'"
+    - "WHEELS='{{ image_registries[0].host }}/{{ image_registries[0].org }}/requirements:{{ image_tag }}'"
+    - "KEEP_ALL_WHEELS=yes"
+    - "APT_MIRROR='{{ apt_mirror }}'"
+
 cyborg_image:
   context: "."
   dockerfile: "Dockerfile"
@@ -344,6 +361,8 @@ openstack_client_pip_packages:
   - python-barbicanclient
   - python-blazarclient
   - python-cinderclient
+  - python-cloudkittyclient
+  - python-cyborgclient
   - python-designateclient
   - python-glanceclient
   - python-heatclient
diff --git a/playbooks/vars_2024.1.yaml b/playbooks/vars_2024.1.yaml
index b5360234..466a1746 100644
--- a/playbooks/vars_2024.1.yaml
+++ b/playbooks/vars_2024.1.yaml
@@ -5,6 +5,7 @@ ceph_repo: "deb https://download.ceph.com/debian-reef/ jammy main"
 openstack_images:
   - "{{ barbican_image }}"
   - "{{ cinder_image }}"
+  - "{{ cloudkitty_image }}"
   - "{{ cyborg_image }}"
   - "{{ designate_image }}"
   - "{{ glance_image }}"
diff --git a/playbooks/vars_2024.2.yaml b/playbooks/vars_2024.2.yaml
index 34cf5899..158e9a8d 100644
--- a/playbooks/vars_2024.2.yaml
+++ b/playbooks/vars_2024.2.yaml
@@ -5,6 +5,7 @@ ceph_repo: "deb https://download.ceph.com/debian-reef/ jammy main"
 openstack_images:
   - "{{ barbican_image }}"
   - "{{ cinder_image }}"
+  - "{{ cloudkitty_image }}"
   - "{{ cyborg_image }}"
   - "{{ designate_image }}"
   - "{{ glance_image }}"
diff --git a/playbooks/vars_2025.1_jammy.yaml b/playbooks/vars_2025.1_jammy.yaml
index 603cc035..cac9e94a 100644
--- a/playbooks/vars_2025.1_jammy.yaml
+++ b/playbooks/vars_2025.1_jammy.yaml
@@ -5,6 +5,7 @@ ceph_repo: "deb https://download.ceph.com/debian-squid/ jammy main"
 openstack_images:
   - "{{ barbican_image }}"
   - "{{ cinder_image }}"
+  - "{{ cloudkitty_image }}"
   - "{{ cyborg_image }}"
   - "{{ designate_image }}"
   - "{{ glance_image }}"
diff --git a/playbooks/vars_2025.1_noble.yaml b/playbooks/vars_2025.1_noble.yaml
index 9b89083b..f0fb92bc 100644
--- a/playbooks/vars_2025.1_noble.yaml
+++ b/playbooks/vars_2025.1_noble.yaml
@@ -6,6 +6,7 @@ ceph_repo: ""
 openstack_images:
   - "{{ barbican_image }}"
   - "{{ cinder_image }}"
+  - "{{ cloudkitty_image }}"
   - "{{ cyborg_image }}"
   - "{{ designate_image }}"
   - "{{ glance_image }}"
diff --git a/playbooks/vars_master_jammy.yaml b/playbooks/vars_master_jammy.yaml
index 61aba6fa..e1ac7f51 100644
--- a/playbooks/vars_master_jammy.yaml
+++ b/playbooks/vars_master_jammy.yaml
@@ -5,6 +5,7 @@ ceph_repo: "deb https://download.ceph.com/debian-squid/ jammy main"
 openstack_images:
   - "{{ barbican_image }}"
   - "{{ cinder_image }}"
+  - "{{ cloudkitty_image }}"
   - "{{ cyborg_image }}"
   - "{{ designate_image }}"
   - "{{ glance_image }}"
diff --git a/playbooks/vars_master_noble.yaml b/playbooks/vars_master_noble.yaml
index d17458ae..c14314e6 100644
--- a/playbooks/vars_master_noble.yaml
+++ b/playbooks/vars_master_noble.yaml
@@ -6,6 +6,7 @@ ceph_repo: ""
 openstack_images:
   - "{{ barbican_image }}"
   - "{{ cinder_image }}"
+  - "{{ cloudkitty_image }}"
   - "{{ cyborg_image }}"
   - "{{ designate_image }}"
   - "{{ glance_image }}"