From 9f1256ba74f05ea815e97e5769f9942f80bc0261 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 24 Apr 2026 19:05:46 +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 Depends-On: https://review.opendev.org/c/openstack/ansible-collection-kolla/+/986150 Change-Id: I8ced621754d03c44b7672dd94fc3d7d2173ac734 Signed-off-by: Michal Nasiadka --- ansible/group_vars/all/horizon.yml | 1 - ansible/group_vars/all/kuryr.yml | 4 ---- ansible/group_vars/all/placement.yml | 2 +- ansible/group_vars/all/zun.yml | 30 ------------------------------ 4 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 ansible/group_vars/all/kuryr.yml delete mode 100644 ansible/group_vars/all/zun.yml (limited to 'ansible/group_vars') diff --git a/ansible/group_vars/all/horizon.yml b/ansible/group_vars/all/horizon.yml index d906f0408..71e1cc5e1 100644 --- a/ansible/group_vars/all/horizon.yml +++ b/ansible/group_vars/all/horizon.yml @@ -15,7 +15,6 @@ enable_horizon_octavia: "{{ enable_octavia | bool }}" enable_horizon_tacker: "{{ enable_tacker | bool }}" enable_horizon_trove: "{{ enable_trove | bool }}" enable_horizon_watcher: "{{ enable_watcher | bool }}" -enable_horizon_zun: "{{ enable_zun | bool }}" ####################### # Horizon options diff --git a/ansible/group_vars/all/kuryr.yml b/ansible/group_vars/all/kuryr.yml deleted file mode 100644 index 8d6fada17..000000000 --- a/ansible/group_vars/all/kuryr.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -enable_kuryr: false - -kuryr_port: "23750" diff --git a/ansible/group_vars/all/placement.yml b/ansible/group_vars/all/placement.yml index 4949393ea..7afa7dcb8 100644 --- a/ansible/group_vars/all/placement.yml +++ b/ansible/group_vars/all/placement.yml @@ -1,5 +1,5 @@ --- -enable_placement: "{{ enable_nova | bool or enable_zun | bool }}" +enable_placement: "{{ enable_nova | bool }}" placement_keystone_user: "placement" diff --git a/ansible/group_vars/all/zun.yml b/ansible/group_vars/all/zun.yml deleted file mode 100644 index 1d767401c..000000000 --- a/ansible/group_vars/all/zun.yml +++ /dev/null @@ -1,30 +0,0 @@ ---- -enable_zun: false - -# Extra docker options for Zun -docker_configure_for_zun: false -docker_zun_options: -H tcp://{{ api_interface_address | put_address_in_context('url') }}:2375 -docker_zun_config: {} -# Extra containerd options for Zun -containerd_configure_for_zun: false - -# Enable Ceph backed Cinder Volumes for zun -zun_configure_for_cinder_ceph: false - -# 42463 is the static group id of the zun user in the Zun image. -# If users customize this value on building the Zun images, -# they need to change this config accordingly. -containerd_grpc_gid: 42463 - -zun_api_port: "9517" -zun_api_public_port: "{{ haproxy_single_external_frontend_public_port if haproxy_single_external_frontend | bool else zun_api_port }}" -zun_api_listen_port: "{{ zun_api_port }}" -zun_wsproxy_internal_fqdn: "{{ kolla_internal_fqdn }}" -zun_wsproxy_external_fqdn: "{{ kolla_external_fqdn }}" -zun_wsproxy_port: "6784" -zun_wsproxy_protocol: "{{ 'wss' if kolla_enable_tls_external | bool else 'ws' }}" -zun_cni_daemon_port: "9036" -zun_internal_fqdn: "{{ kolla_internal_fqdn }}" -zun_external_fqdn: "{{ kolla_external_fqdn }}" -zun_internal_base_endpoint: "{{ zun_internal_fqdn | kolla_url(internal_protocol, zun_api_port) }}" -zun_public_base_endpoint: "{{ zun_external_fqdn | kolla_url(public_protocol, zun_api_public_port) }}" -- cgit v1.2.3