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 --- etc/kolla/globals.yml | 9 +-------- etc/kolla/passwords.yml | 5 ----- 2 files changed, 1 insertion(+), 13 deletions(-) (limited to 'etc') diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index b4ade81ca..44904c9d7 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -110,10 +110,6 @@ workaround_ansible_issue_8743: true # Docker client timeout in seconds. #docker_client_timeout: 120 -#docker_configure_for_zun: false -#containerd_configure_for_zun: false -#containerd_grpc_gid: 42463 - ################### # Messaging options ################### @@ -381,13 +377,11 @@ workaround_ansible_issue_8743: true #enable_horizon_tacker: "{{ enable_tacker | bool }}" #enable_horizon_trove: "{{ enable_trove | bool }}" #enable_horizon_watcher: "{{ enable_watcher | bool }}" -#enable_horizon_zun: "{{ enable_zun | bool }}" #enable_ironic: false #enable_ironic_neutron_agent: false #enable_ironic_prometheus_exporter: "{{ enable_ironic | bool and enable_prometheus | bool }}" #enable_ironic_pxe_filter: false #enable_iscsid: "{{ enable_cinder | bool and enable_cinder_backend_iscsi | bool }}" -#enable_kuryr: false #enable_magnum: false #enable_manila: false #enable_manila_backend_generic: false @@ -432,7 +426,7 @@ workaround_ansible_issue_8743: true #enable_ovn: "{{ enable_neutron | bool and neutron_plugin_agent == 'ovn' }}" #enable_ovs_dpdk: false #enable_osprofiler: false -#enable_placement: "{{ enable_nova | bool or enable_zun | bool }}" +#enable_placement: "{{ enable_nova | bool }}" #enable_prometheus: false #enable_proxysql: true #enable_valkey: false @@ -441,7 +435,6 @@ workaround_ansible_issue_8743: true #enable_trove: false #enable_trove_singletenant: false #enable_watcher: false -#enable_zun: false ############# # S3 options diff --git a/etc/kolla/passwords.yml b/etc/kolla/passwords.yml index 1120754a8..ac45a61ae 100644 --- a/etc/kolla/passwords.yml +++ b/etc/kolla/passwords.yml @@ -60,8 +60,6 @@ glance_keystone_password: gnocchi_database_password: gnocchi_keystone_password: -kuryr_keystone_password: - nova_database_password: nova_api_database_password: nova_keystone_password: @@ -128,9 +126,6 @@ octavia_client_ca_password: tacker_database_password: tacker_keystone_password: -zun_database_password: -zun_keystone_password: - masakari_database_password: masakari_keystone_password: -- cgit v1.2.3