From 77b92c33f979ad5ae4321a1b3604ce90a99415a1 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 24 Apr 2026 19:11:48 +0200
Subject: Drop zun and kuryr

Zun is broken in 2026.1, it has been released broken and there are
no reviews on the patch to fix it [1].

[1]: https://review.opendev.org/c/openstack/zun/+/982362

Change-Id: I770b9e62c66f8cc63475d51f80eecacc8415b91f
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
---
 kolla/common/config.py  |  2 --
 kolla/common/sources.py | 18 +-----------------
 kolla/common/users.py   |  4 ++--
 3 files changed, 3 insertions(+), 21 deletions(-)

(limited to 'kolla')

diff --git a/kolla/common/config.py b/kolla/common/config.py
index d66221af1..7657ed485 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -88,7 +88,6 @@ _PROFILE_OPTS = [
                     'designate',
                     'gnocchi',
                     'ironic',
-                    'kuryr',
                     'magnum',
                     'manila',
                     'masakari',
@@ -97,7 +96,6 @@ _PROFILE_OPTS = [
                     'tacker',
                     'trove',
                     'valkey',
-                    'zun',
                 ],
                 help='Aux Images'),
     cfg.ListOpt('default',
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index 9e2e53874..c2958b265 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -139,10 +139,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/watcher-dashboard/'
                      'watcher-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-zun-ui': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/zun-ui/'
-                     'zun-ui-${openstack_branch}.tar.gz')},
     'ironic-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/ironic/'
@@ -160,14 +156,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/requirements/'
                      'requirements-${openstack_branch}.tar.gz')},
-    'kuryr-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/kuryr/'
-                     'kuryr-${openstack_branch}.tar.gz')},
-    'kuryr-libnetwork': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/kuryr-libnetwork/'
-                     'kuryr-libnetwork-${openstack_branch}.tar.gz')},
     'letsencrypt-lego': {
         'version': 'v4.27.0',
         'type': 'url',
@@ -435,9 +423,5 @@ SOURCES = {
     'watcher-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/watcher/'
-                     'watcher-${openstack_branch}.tar.gz')},
-    'zun-base': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/zun/'
-                     'zun-${openstack_branch}.tar.gz')}
+                     'watcher-${openstack_branch}.tar.gz')}
 }
diff --git a/kolla/common/users.py b/kolla/common/users.py
index 623456071..cd0a66660 100644
--- a/kolla/common/users.py
+++ b/kolla/common/users.py
@@ -229,7 +229,7 @@ USERS = {
         'uid': 42462,
         'gid': 42462,
     },
-    'zun-user': {
+    'zun-user': {  # unused user (zun dropped)
         'uid': 42463,
         'gid': 42463,
     },
@@ -253,7 +253,7 @@ USERS = {
         'uid': 42468,
         'gid': 42468,
     },
-    'kuryr-user': {
+    'kuryr-user': {  # unused user (kuryr dropped)
         'uid': 42469,
         'gid': 42469,
     },
-- 
cgit v1.2.3