diff options
| author | Zuul <zuul@review.opendev.org> | 2026-04-27 10:14:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-04-27 10:14:02 +0000 |
| commit | cd7138495673e04e034334d00cd0886f16eba59c (patch) | |
| tree | ce41ea2e322e383c264aca42945c6e0141f3fd99 /kolla/common | |
| parent | 8dc6bf38352f741fd92cf4c3bfe1adc2ae71ae60 (diff) | |
| parent | 77b92c33f979ad5ae4321a1b3604ce90a99415a1 (diff) | |
| download | kolla-cd7138495673e04e034334d00cd0886f16eba59c.tar.gz kolla-cd7138495673e04e034334d00cd0886f16eba59c.zip | |
Merge "Drop zun and kuryr"
Diffstat (limited to 'kolla/common')
| -rw-r--r-- | kolla/common/config.py | 2 | ||||
| -rw-r--r-- | kolla/common/sources.py | 18 | ||||
| -rw-r--r-- | kolla/common/users.py | 4 |
3 files changed, 3 insertions, 21 deletions
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 7a815c569..e3c2b5628 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', @@ -440,9 +428,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, }, |