Merge "Drop zun and kuryr"

63 files changed, 1 insertions, 1489 deletions

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) }}"
diff --git a/ansible/inventory/all-in-one b/ansible/inventory/all-in-one
index a878e29a6..2f5f1cf38 100644
--- a/ansible/inventory/all-in-one
+++ b/ansible/inventory/all-in-one
@@ -142,9 +142,6 @@ control
 [bifrost:children]
 deployment
 
-[zun:children]
-control
-
 [skyline:children]
 control
 
@@ -491,19 +488,6 @@ designate
 [placement-api:children]
 placement
 
-# Zun
-[zun-api:children]
-zun
-
-[zun-wsproxy:children]
-zun
-
-[zun-compute:children]
-compute
-
-[zun-cni-daemon:children]
-compute
-
 # Skyline
 [skyline-apiserver:children]
 skyline
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 2b3157b9c..7bfa71ed0 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -160,9 +160,6 @@ control
 [bifrost:children]
 deployment
 
-[zun:children]
-control
-
 [skyline:children]
 control
 
@@ -508,19 +505,6 @@ designate
 [placement-api:children]
 placement
 
-# Zun
-[zun-api:children]
-zun
-
-[zun-wsproxy:children]
-zun
-
-[zun-compute:children]
-compute
-
-[zun-cni-daemon:children]
-compute
-
 # Skyline
 [skyline-apiserver:children]
 skyline
diff --git a/ansible/roles/cron/tasks/config.yml b/ansible/roles/cron/tasks/config.yml
index 2bc2018f4..04cb91ba5 100644
--- a/ansible/roles/cron/tasks/config.yml
+++ b/ansible/roles/cron/tasks/config.yml
@@ -54,7 +54,6 @@
       - { name: "horizon", enabled: "{{ enable_horizon | bool }}" }
       - { name: "ironic", enabled: "{{ enable_ironic | bool }}" }
       - { name: "keystone", enabled: "{{ enable_keystone | bool }}" }
-      - { name: "kuryr", enabled: "{{ enable_kuryr | bool }}" }
       - { name: "magnum", enabled: "{{ enable_magnum | bool }}" }
       - { name: "manila", enabled: "{{ enable_manila | bool }}" }
       - { name: "mariadb", enabled: "{{ enable_mariadb | bool }}" }
@@ -76,7 +75,6 @@
       - { name: "tacker", enabled: "{{ enable_tacker | bool }}" }
       - { name: "trove", enabled: "{{ enable_trove | bool }}" }
       - { name: "watcher", enabled: "{{ enable_watcher | bool }}" }
-      - { name: "zun", enabled: "{{ enable_zun | bool }}" }
   ansible.builtin.template:
     src: "{{ item }}"
     dest: "{{ node_config_directory }}/cron/logrotate.conf"
diff --git a/ansible/roles/fluentd/defaults/main.yml b/ansible/roles/fluentd/defaults/main.yml
index cdb6a8f47..e21b24458 100644
--- a/ansible/roles/fluentd/defaults/main.yml
+++ b/ansible/roles/fluentd/defaults/main.yml
@@ -101,8 +101,6 @@ fluentd_input_openstack_services:
     enabled: "{{ enable_ironic | bool }}"
   - name: keystone
     enabled: "{{ enable_keystone | bool }}"
-  - name: kuryr
-    enabled: "{{ enable_kuryr | bool }}"
   - name: magnum
     enabled: "{{ enable_magnum | bool }}"
   - name: manila
diff --git a/ansible/roles/fluentd/templates/conf/filter/01-rewrite.conf.j2 b/ansible/roles/fluentd/templates/conf/filter/01-rewrite.conf.j2
index d6bb68490..02f960700 100644
--- a/ansible/roles/fluentd/templates/conf/filter/01-rewrite.conf.j2
+++ b/ansible/roles/fluentd/templates/conf/filter/01-rewrite.conf.j2
@@ -93,16 +93,6 @@
   </rule>
   <rule>
     key     programname
-    pattern ^(zun-api|zun-compute|zun-cni-daemon)$
-    tag openstack_python
-  </rule>
-  <rule>
-    key     programname
-    pattern ^(kuryr-server)$
-    tag openstack_python
-  </rule>
-  <rule>
-    key     programname
     pattern ^(gnocchi-api|gnocchi-statsd|gnocchi-metricd|gnocchi-upgrade)$
     tag openstack_python
   </rule>
diff --git a/ansible/roles/horizon/defaults/main.yml b/ansible/roles/horizon/defaults/main.yml
index de4f6129a..04cd14761 100644
--- a/ansible/roles/horizon/defaults/main.yml
+++ b/ansible/roles/horizon/defaults/main.yml
@@ -21,7 +21,6 @@ horizon_services:
       ENABLE_TACKER: "{{ 'yes' if enable_horizon_tacker | bool else 'no' }}"
       ENABLE_TROVE: "{{ 'yes' if enable_horizon_trove | bool else 'no' }}"
       ENABLE_WATCHER: "{{ 'yes' if enable_horizon_watcher | bool else 'no' }}"
-      ENABLE_ZUN: "{{ 'yes' if enable_horizon_zun | bool else 'no' }}"
       FORCE_GENERATE: "{{ 'yes' if horizon_dev_mode | bool else 'no' }}"
     volumes: "{{ horizon_default_volumes + horizon_extra_volumes }}"
     dimensions: "{{ horizon_dimensions }}"
diff --git a/ansible/roles/kuryr/defaults/main.yml b/ansible/roles/kuryr/defaults/main.yml
deleted file mode 100644
index 1b90c9d37..000000000
--- a/ansible/roles/kuryr/defaults/main.yml
+++ /dev/null
@@ -1,98 +0,0 @@
----
-libnetwork_project_name: "kuryr-libnetwork"
-
-# NOTE(huikang, apuimedo): when you request a driver in a docker operation, such
-# as docker network create, docker searches /usr/lib/docker or /etc/docker
-# subdirs for network/storage plugin specs or json definitions. so it's either
-# have ansible place the file there, or volume mount it and let the container
-# place the file there
-
-kuryr_services:
-  kuryr:
-    container_name: kuryr
-    group: compute
-    enabled: true
-    image: "{{ kuryr_image_full }}"
-    privileged: true
-    cap_add:
-      - NET_ADMIN
-    volumes: "{{ kuryr_default_volumes + kuryr_extra_volumes + lookup('vars', 'run_default_volumes_' + kolla_container_engine) }}"
-    dimensions: "{{ kuryr_dimensions }}"
-    healthcheck: "{{ kuryr_healthcheck }}"
-
-####################
-# Config Validate
-####################
-kuryr_config_validation:
-  - generator: "/kuryr/etc/kuryr-config-generator.conf"
-    config: "/etc/kuryr/kuryr.conf"
-
-####################
-# Docker
-####################
-kuryr_image: "{{ docker_image_url }}kuryr-libnetwork"
-kuryr_tag: "{{ openstack_tag }}"
-kuryr_image_full: "{{ kuryr_image }}:{{ kuryr_tag }}"
-
-kuryr_enable_healthchecks: "{{ enable_container_healthchecks }}"
-kuryr_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
-kuryr_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
-kuryr_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
-kuryr_healthcheck_test: ["CMD-SHELL", "healthcheck_listen kuryr-server {{ kuryr_port }}"]
-kuryr_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
-kuryr_healthcheck:
-  interval: "{{ kuryr_healthcheck_interval }}"
-  retries: "{{ kuryr_healthcheck_retries }}"
-  start_period: "{{ kuryr_healthcheck_start_period }}"
-  test: "{% if kuryr_enable_healthchecks | bool %}{{ kuryr_healthcheck_test }}{% else %}NONE{% endif %}"
-  timeout: "{{ kuryr_healthcheck_timeout }}"
-
-kuryr_default_volumes:
-  - "{{ node_config_directory }}/kuryr/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "/lib/modules:/lib/modules:ro"
-  - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}"
-  - "/usr/lib/docker:/usr/lib/docker"
-  - "{{ kolla_dev_repos_directory ~ '/kuryr:/dev-mode/kuryr' if kuryr_dev_mode | bool else '' }}"
-  - "{{ kolla_dev_repos_directory ~ '/kuryr-libnetwork:/dev-mode/kuryr-libnetwork' if kuryr_dev_mode | bool else '' }}"
-  - "kolla_logs:/var/log/kolla/"
-
-kuryr_extra_volumes: "{{ default_extra_volumes }}"
-
-####################
-# OpenStack
-####################
-kuryr_logging_debug: "{{ openstack_logging_debug }}"
-
-kuryr_keystone_user: "kuryr"
-
-openstack_kuryr_auth: "{{ openstack_auth }}"
-
-####################
-# Kolla
-####################
-kuryr_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
-kuryr_libnetwork_git_repository: "{{ kolla_dev_repos_git }}/{{ libnetwork_project_name }}"
-kuryr_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
-kuryr_dev_mode: "{{ kolla_dev_mode }}"
-kuryr_dimensions: "{{ default_container_dimensions }}"
-kuryr_source_version: "{{ kolla_source_version }}"
-
-####################
-# Keystone
-####################
-kuryr_ks_users:
-  - project: "service"
-    user: "{{ kuryr_keystone_user }}"
-    password: "{{ kuryr_keystone_password }}"
-    role: "admin"
-
-###########
-# Endpoints
-##########
-kuryr_internal_endpoint: "{{ internal_protocol }}://{{ api_interface_address | put_address_in_context('url') }}:{{ kuryr_port }}"
-
-###################
-# Copy certificates
-###################
-kuryr_copy_certs: "{{ kolla_copy_ca_into_containers | bool }}"
diff --git a/ansible/roles/kuryr/handlers/main.yml b/ansible/roles/kuryr/handlers/main.yml
deleted file mode 100644
index aa4cad094..000000000
--- a/ansible/roles/kuryr/handlers/main.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: Restart kuryr container
-  vars:
-    service_name: "kuryr"
-    service: "{{ kuryr_services[service_name] }}"
-  become: true
-  kolla_container:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    privileged: "{{ service.privileged | default(False) }}"
-    cap_add: "{{ service.cap_add }}"
-    volumes: "{{ service.volumes }}"
-    dimensions: "{{ service.dimensions }}"
-    healthcheck: "{{ service.healthcheck | default(omit) }}"
diff --git a/ansible/roles/kuryr/tasks/check-containers.yml b/ansible/roles/kuryr/tasks/check-containers.yml
deleted file mode 100644
index 8de17dc33..000000000
--- a/ansible/roles/kuryr/tasks/check-containers.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: Check kuryr containers
-  ansible.builtin.import_role:
-    name: service-check-containers
diff --git a/ansible/roles/kuryr/tasks/check.yml b/ansible/roles/kuryr/tasks/check.yml
deleted file mode 100644
index bea4512cc..000000000
--- a/ansible/roles/kuryr/tasks/check.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: Checking Kuryr containers
-  ansible.builtin.import_role:
-    role: service-check
diff --git a/ansible/roles/kuryr/tasks/clone.yml b/ansible/roles/kuryr/tasks/clone.yml
deleted file mode 100644
index 8eaead5d0..000000000
--- a/ansible/roles/kuryr/tasks/clone.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- name: Cloning kuryr source repository for development
-  become: true
-  ansible.builtin.git:
-    repo: "{{ kuryr_git_repository }}"
-    dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
-    update: "{{ kuryr_dev_repos_pull }}"
-    version: "{{ kuryr_source_version }}"
-
-- name: Cloning kuryr-libnetwork source repository for development
-  become: true
-  ansible.builtin.git:
-    repo: "{{ kuryr_libnetwork_git_repository }}"
-    dest: "{{ kolla_dev_repos_directory }}/{{ libnetwork_project_name }}"
-    update: "{{ kuryr_dev_repos_pull }}"
-    version: "{{ kuryr_source_version }}"
diff --git a/ansible/roles/kuryr/tasks/config.yml b/ansible/roles/kuryr/tasks/config.yml
deleted file mode 100644
index f1f8ad190..000000000
--- a/ansible/roles/kuryr/tasks/config.yml
+++ /dev/null
@@ -1,79 +0,0 @@
----
-- name: Ensuring config directories exist
-  ansible.builtin.file:
-    path: "{{ node_config_directory }}/{{ item.key }}"
-    state: "directory"
-    owner: "{{ config_owner_user }}"
-    group: "{{ config_owner_group }}"
-    mode: "0770"
-  become: true
-  with_dict: "{{ kuryr_services | select_services_enabled_and_mapped_to_host }}"
-
-- name: Check if policies shall be overwritten
-  ansible.builtin.stat:
-    path: "{{ item }}"
-  delegate_to: localhost
-  run_once: true
-  register: kuryr_policy
-  with_first_found:
-    - files: "{{ supported_policy_format_list }}"
-      paths:
-        - "{{ node_custom_config }}/kuryr/"
-      skip: true
-
-- name: Set kuryr policy file
-  ansible.builtin.set_fact:
-    kuryr_policy_file: "{{ kuryr_policy.results.0.stat.path | basename }}"
-    kuryr_policy_file_path: "{{ kuryr_policy.results.0.stat.path }}"
-  when:
-    - kuryr_policy.results | length > 0
-
-- name: Copying over TLS certificates
-  ansible.builtin.include_tasks: copy-certs.yml
-  when:
-    - kuryr_copy_certs | bool
-
-- name: Copying over config.json files for services
-  ansible.builtin.template:
-    src: "{{ item.key }}.json.j2"
-    dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
-    mode: "0660"
-  become: true
-  with_dict: "{{ kuryr_services | select_services_enabled_and_mapped_to_host }}"
-
-- name: Copying over kuryr.conf
-  vars:
-    service_name: "{{ item.key }}"
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/kuryr.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/kuryr.conf"
-      - "{{ node_custom_config }}/kuryr/{{ item.key }}.conf"
-      - "{{ node_custom_config }}/kuryr/{{ inventory_hostname }}/{{ item.key }}.conf"
-    dest: "{{ node_config_directory }}/{{ item.key }}/kuryr.conf"
-    mode: "0660"
-  become: true
-  with_dict: "{{ kuryr_services | select_services_enabled_and_mapped_to_host }}"
-
-- name: Copying over kuryr.spec
-  vars:
-    service: "{{ kuryr_services['kuryr'] }}"
-  ansible.builtin.template:
-    src: "kuryr.spec.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/kuryr.spec"
-    mode: "0660"
-  become: true
-  when: service | service_enabled_and_mapped_to_host
-  with_items:
-    - "kuryr"
-
-- name: Copying over existing policy file
-  ansible.builtin.template:
-    src: "{{ kuryr_policy_file_path }}"
-    dest: "{{ node_config_directory }}/{{ item.key }}/{{ kuryr_policy_file }}"
-    mode: "0660"
-  become: true
-  when:
-    - kuryr_policy_file is defined
-  with_dict: "{{ kuryr_services | select_services_enabled_and_mapped_to_host }}"
diff --git a/ansible/roles/kuryr/tasks/config_validate.yml b/ansible/roles/kuryr/tasks/config_validate.yml
deleted file mode 100644
index 47d6a6621..000000000
--- a/ansible/roles/kuryr/tasks/config_validate.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Validate kuryr configuration
-  ansible.builtin.import_role:
-    name: service-config-validate
-  vars:
-    service_config_validate_services: "{{ kuryr_services }}"
-    service_name: "{{ project_name }}"
-    service_config_validation: "{{ kuryr_config_validation }}"
diff --git a/ansible/roles/kuryr/tasks/copy-certs.yml b/ansible/roles/kuryr/tasks/copy-certs.yml
deleted file mode 100644
index 90781daed..000000000
--- a/ansible/roles/kuryr/tasks/copy-certs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: "Copy certificates and keys for {{ project_name }}"
-  ansible.builtin.import_role:
-    role: service-cert-copy
-  vars:
-    project_services: "{{ kuryr_services }}"
diff --git a/ansible/roles/kuryr/tasks/deploy-containers.yml b/ansible/roles/kuryr/tasks/deploy-containers.yml
deleted file mode 100644
index 764417502..000000000
--- a/ansible/roles/kuryr/tasks/deploy-containers.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: Check kuryr containers
-  ansible.builtin.import_tasks: check-containers.yml
diff --git a/ansible/roles/kuryr/tasks/deploy.yml b/ansible/roles/kuryr/tasks/deploy.yml
deleted file mode 100644
index 6a4dfc7dc..000000000
--- a/ansible/roles/kuryr/tasks/deploy.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: Register kuryr in Keystone
-  ansible.builtin.import_tasks: register.yml
-
-- name: Configure kuryr
-  ansible.builtin.import_tasks: config.yml
-
-- name: Check kuryr containers
-  ansible.builtin.import_tasks: check-containers.yml
-
-- name: Clone kuryr repository
-  ansible.builtin.include_tasks: clone.yml
-  when:
-    - kuryr_dev_mode | bool
-
-- name: Flush handlers
-  ansible.builtin.meta: flush_handlers
diff --git a/ansible/roles/kuryr/tasks/main.yml b/ansible/roles/kuryr/tasks/main.yml
deleted file mode 100644
index 594ad5d85..000000000
--- a/ansible/roles/kuryr/tasks/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: "Include tasks for action {{ kolla_action }}"
-  ansible.builtin.include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/kuryr/tasks/precheck.yml b/ansible/roles/kuryr/tasks/precheck.yml
deleted file mode 100644
index 474108135..000000000
--- a/ansible/roles/kuryr/tasks/precheck.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-- name: Precheck kuryr configuration
-  ansible.builtin.import_role:
-    name: service-precheck
-  vars:
-    service_precheck_services: "{{ kuryr_services }}"
-    service_name: "{{ project_name }}"
-
-- name: Get container facts
-  become: true
-  kolla_container_facts:
-    action: get_containers
-    container_engine: "{{ kolla_container_engine }}"
-    name:
-      - kuryr
-  check_mode: false
-  register: container_facts
-
-- name: Checking free port for Kuryr
-  ansible.builtin.wait_for:
-    host: "{{ api_interface_address }}"
-    port: "{{ kuryr_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['kuryr'] is not defined
-    - inventory_hostname in groups['compute']
diff --git a/ansible/roles/kuryr/tasks/pull.yml b/ansible/roles/kuryr/tasks/pull.yml
deleted file mode 100644
index 7b81e1474..000000000
--- a/ansible/roles/kuryr/tasks/pull.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: Pull kuryr images
-  ansible.builtin.import_role:
-    role: service-images-pull
diff --git a/ansible/roles/kuryr/tasks/reconfigure.yml b/ansible/roles/kuryr/tasks/reconfigure.yml
deleted file mode 100644
index 5d261b668..000000000
--- a/ansible/roles/kuryr/tasks/reconfigure.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: Deploy kuryr
-  ansible.builtin.import_tasks: deploy.yml
diff --git a/ansible/roles/kuryr/tasks/register.yml b/ansible/roles/kuryr/tasks/register.yml
deleted file mode 100644
index 483792787..000000000
--- a/ansible/roles/kuryr/tasks/register.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Register kuryr service, endpoints, and users in Keystone
-  ansible.builtin.import_role:
-    name: service-ks-register
-  vars:
-    service_ks_register_auth: "{{ openstack_kuryr_auth }}"
-    service_ks_register_users: "{{ kuryr_ks_users }}"
diff --git a/ansible/roles/kuryr/tasks/stop.yml b/ansible/roles/kuryr/tasks/stop.yml
deleted file mode 100644
index 1cd93b148..000000000
--- a/ansible/roles/kuryr/tasks/stop.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Stop kuryr containers
-  ansible.builtin.import_role:
-    name: service-stop
-  vars:
-    project_services: "{{ kuryr_services }}"
-    service_name: "{{ project_name }}"
diff --git a/ansible/roles/kuryr/tasks/upgrade.yml b/ansible/roles/kuryr/tasks/upgrade.yml
deleted file mode 100644
index 57b441eb2..000000000
--- a/ansible/roles/kuryr/tasks/upgrade.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Configure kuryr
-  ansible.builtin.import_tasks: config.yml
-
-- name: Check kuryr containers
-  ansible.builtin.import_tasks: check-containers.yml
-
-- name: Flush handlers
-  ansible.builtin.meta: flush_handlers
diff --git a/ansible/roles/kuryr/templates/kuryr.conf.j2 b/ansible/roles/kuryr/templates/kuryr.conf.j2
deleted file mode 100644
index 00c8784bb..000000000
--- a/ansible/roles/kuryr/templates/kuryr.conf.j2
+++ /dev/null
@@ -1,32 +0,0 @@
-[DEFAULT]
-kuryr_uri = {{ kuryr_internal_endpoint }}
-debug = {{ kuryr_logging_debug }}
-log_dir = /var/log/kolla/kuryr
-
-capability_scope = local
-bindir = /var/lib/kolla/venv/libexec/kuryr
-
-[binding]
-default_driver = kuryr.lib.binding.drivers.veth
-
-[neutron]
-auth_uri = {{ keystone_internal_url }}
-auth_url = {{ keystone_internal_url }}
-auth_type = password
-endpoint_type = internal
-project_domain_name = {{ default_project_domain_name }}
-project_name = service
-user_domain_name = {{ default_user_domain_name }}
-project_domain_id = {{ default_project_domain_id }}
-user_domain_id = {{ default_user_domain_id }}
-password = {{ kuryr_keystone_password }}
-username = {{ kuryr_keystone_user }}
-cafile = {{ openstack_cacert }}
-
-{% if kuryr_policy_file is defined %}
-[oslo_policy]
-policy_file = {{ kuryr_policy_file }}
-{% endif %}
-
-[oslo_concurrency]
-lock_path = /var/lib/kuryr/tmp
diff --git a/ansible/roles/kuryr/templates/kuryr.json.j2 b/ansible/roles/kuryr/templates/kuryr.json.j2
deleted file mode 100644
index 4ba23100f..000000000
--- a/ansible/roles/kuryr/templates/kuryr.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "kuryr-server --config-file /etc/kuryr/kuryr.conf",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/kuryr.conf",
-            "dest": "/etc/kuryr/kuryr.conf",
-            "owner": "kuryr",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/kuryr.spec",
-            "dest": "/usr/lib/docker/plugins/kuryr/kuryr.spec",
-            "owner": "root",
-            "perm": "0600"
-        }{% if kuryr_policy_file is defined %},
-        {
-            "source": "{{ container_config_directory }}/{{ kuryr_policy_file }}",
-            "dest": "/etc/kuryr/{{ kuryr_policy_file }}",
-            "owner": "kuryr",
-            "perm": "0600"
-        }{% endif %}{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/kolla/kuryr",
-            "owner": "kuryr:kolla",
-            "recurse": true
-        }
-    ]
-}
diff --git a/ansible/roles/kuryr/templates/kuryr.spec.j2 b/ansible/roles/kuryr/templates/kuryr.spec.j2
deleted file mode 100644
index 06c8be3d0..000000000
--- a/ansible/roles/kuryr/templates/kuryr.spec.j2
+++ /dev/null
@@ -1 +0,0 @@
-{{ kuryr_internal_endpoint }}
diff --git a/ansible/roles/kuryr/vars/main.yml b/ansible/roles/kuryr/vars/main.yml
deleted file mode 100644
index dfe30f4a9..000000000
--- a/ansible/roles/kuryr/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-project_name: "kuryr"
diff --git a/ansible/roles/loadbalancer/tasks/precheck.yml b/ansible/roles/loadbalancer/tasks/precheck.yml
index 73e3a1566..54ab85903 100644
--- a/ansible/roles/loadbalancer/tasks/precheck.yml
+++ b/ansible/roles/loadbalancer/tasks/precheck.yml
@@ -717,19 +717,6 @@
     - haproxy_stat.find('watcher_api') == -1
     - haproxy_vip_prechecks
 
-- name: Checking free port for Zun API HAProxy
-  ansible.builtin.wait_for:
-    host: "{{ kolla_internal_vip_address }}"
-    port: "{{ zun_api_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - enable_zun | bool
-    - inventory_hostname in groups['loadbalancer']
-    - haproxy_stat.find('zun_api') == -1
-    - haproxy_vip_prechecks
-
 - name: Firewalld checks
   when:
     - enable_external_api_firewalld | bool
diff --git a/ansible/roles/prometheus/defaults/main.yml b/ansible/roles/prometheus/defaults/main.yml
index 1145286c8..3416f72d9 100644
--- a/ansible/roles/prometheus/defaults/main.yml
+++ b/ansible/roles/prometheus/defaults/main.yml
@@ -313,10 +313,6 @@ prometheus_blackbox_exporter_endpoints_default:
       - "watcher:os_endpoint:{{ watcher_public_endpoint }}"
       - "{{ ('watcher_internal:os_endpoint:' + watcher_internal_endpoint) if not kolla_same_external_internal_vip | bool }}"
     enabled: "{{ enable_watcher | bool }}"
-  - endpoints:
-      - "zun:os_endpoint:{{ zun_public_base_endpoint }}"
-      - "{{ ('zun_internal:os_endpoint:' + zun_internal_base_endpoint) if not kolla_same_external_internal_vip | bool }}"
-    enabled: "{{ enable_zun | bool }}"
   # Additional service endpoints
   - endpoints: >-
       {%- set ns = namespace(etcd_endpoints=[]) -%}
diff --git a/ansible/roles/skyline/templates/nginx.conf.j2 b/ansible/roles/skyline/templates/nginx.conf.j2
index 4a647fbe5..221323ed2 100644
--- a/ansible/roles/skyline/templates/nginx.conf.j2
+++ b/ansible/roles/skyline/templates/nginx.conf.j2
@@ -222,18 +222,6 @@ http {
         }
         {% endif %}
 
-        {% if enable_zun | bool %}# Region: {{ openstack_region_name }}, Service: zun
-        location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/zun {
-            proxy_pass {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ zun_api_port }}/;
-            proxy_redirect {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ zun_api_port }}/ {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/zun/;
-            proxy_buffering off;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_set_header X-Forwarded-Host $host;
-            proxy_set_header Host $http_host;
-        }
-        {% endif %}
-
         {% if enable_magnum | bool %}# Region: {{ openstack_region_name }}, Service: magnum
         location {{ skyline_nginx_prefix }}/{{ openstack_region_name | lower }}/magnum {
             proxy_pass {{ internal_protocol }}://{{ kolla_internal_fqdn | put_address_in_context('url') }}:{{ magnum_api_port }}/;
diff --git a/ansible/roles/skyline/templates/skyline.yaml.j2 b/ansible/roles/skyline/templates/skyline.yaml.j2
index 9d0ae0741..64c57b329 100644
--- a/ansible/roles/skyline/templates/skyline.yaml.j2
+++ b/ansible/roles/skyline/templates/skyline.yaml.j2
@@ -44,9 +44,6 @@ openstack:
 {% if enable_nova | bool %}
     compute: nova
 {% endif %}
-{% if enable_zun | bool %}
-    container: zun
-{% endif %}
 {% if enable_magnum | bool %}
     container-infra: magnum
 {% endif %}
diff --git a/ansible/roles/zun/defaults/main.yml b/ansible/roles/zun/defaults/main.yml
deleted file mode 100644
index 69fce72c2..000000000
--- a/ansible/roles/zun/defaults/main.yml
+++ /dev/null
@@ -1,265 +0,0 @@
----
-zun_services:
-  zun-api:
-    container_name: zun_api
-    group: zun-api
-    enabled: true
-    image: "{{ zun_api_image_full }}"
-    volumes: "{{ zun_api_default_volumes + zun_api_extra_volumes }}"
-    dimensions: "{{ zun_api_dimensions }}"
-    healthcheck: "{{ zun_api_healthcheck }}"
-    wsgi: "zun.wsgi.api:application"
-    haproxy:
-      zun_api:
-        enabled: "{{ enable_zun }}"
-        mode: "http"
-        external: false
-        port: "{{ zun_api_port }}"
-        listen_port: "{{ zun_api_listen_port }}"
-        backend_http_extra:
-          - "option httpchk GET /healthcheck"
-          - "http-check expect status 200"
-      zun_api_external:
-        enabled: "{{ enable_zun }}"
-        mode: "http"
-        external: true
-        external_fqdn: "{{ zun_external_fqdn }}"
-        port: "{{ zun_api_public_port }}"
-        listen_port: "{{ zun_api_listen_port }}"
-        backend_http_extra:
-          - "option httpchk GET /healthcheck"
-          - "http-check expect status 200"
-  zun-wsproxy:
-    container_name: zun_wsproxy
-    group: zun-wsproxy
-    enabled: true
-    image: "{{ zun_wsproxy_image_full }}"
-    volumes: "{{ zun_wsproxy_default_volumes + zun_wsproxy_extra_volumes }}"
-    dimensions: "{{ zun_wsproxy_dimensions }}"
-    healthcheck: "{{ zun_wsproxy_healthcheck }}"
-    haproxy:
-      zun_wsproxy:
-        enabled: "{{ enable_zun }}"
-        mode: "http"
-        external: false
-        port: "{{ zun_wsproxy_port }}"
-      zun_wsproxy_external:
-        enabled: "{{ enable_zun }}"
-        mode: "http"
-        external: true
-        port: "{{ zun_wsproxy_port }}"
-  zun-compute:
-    container_name: zun_compute
-    group: zun-compute
-    enabled: true
-    image: "{{ zun_compute_image_full }}"
-    privileged: true
-    volumes: "{{ zun_compute_default_volumes + zun_compute_extra_volumes + lookup('vars', 'run_default_volumes_' + kolla_container_engine) }}"
-    dimensions: "{{ zun_compute_dimensions }}"
-    healthcheck: "{{ zun_compute_healthcheck }}"
-  zun-cni-daemon:
-    container_name: zun_cni_daemon
-    group: zun-cni-daemon
-    enabled: true
-    image: "{{ zun_cni_daemon_image_full }}"
-    privileged: true
-    volumes: "{{ zun_cni_daemon_default_volumes + zun_cni_daemon_extra_volumes + lookup('vars', 'run_default_volumes_' + kolla_container_engine) }}"
-    dimensions: "{{ zun_cni_daemon_dimensions }}"
-    healthcheck: "{{ zun_cni_daemon_healthcheck }}"
-
-####################
-# Config Validate
-####################
-zun_config_validation:
-  - generator: "/zun/etc/zun/zun-config-generator.conf"
-    config: "/etc/zun/zun.conf"
-
-####################
-## Database
-####################
-zun_database_name: "zun"
-zun_database_user: "{% if use_preconfigured_databases | bool and use_common_mariadb_user | bool %}{{ database_user }}{% else %}zun{% endif %}"
-zun_database_address: "{{ database_address | put_address_in_context('url') }}:{{ database_port }}"
-
-####################
-# Database sharding
-####################
-zun_database_shard_root_user: "{% if enable_proxysql | bool %}root_shard_{{ zun_database_shard_id }}{% else %}{{ database_user }}{% endif %}"
-zun_database_shard_id: "{{ mariadb_default_database_shard_id | int }}"
-zun_database_shard:
-  users:
-    - user: "{{ zun_database_user }}"
-      password: "{{ zun_database_password }}"
-      shard_id: "{{ zun_database_shard_id }}"
-  rules:
-    - schema: "{{ zun_database_name }}"
-      shard_id: "{{ zun_database_shard_id }}"
-    - user: "{{ zun_database_user }}"
-      shard_id: "{{ zun_database_shard_id }}"
-
-
-####################
-## Docker
-####################
-zun_tag: "{{ openstack_tag }}"
-
-zun_api_image: "{{ docker_image_url }}zun-api"
-zun_api_tag: "{{ zun_tag }}"
-zun_api_image_full: "{{ zun_api_image }}:{{ zun_api_tag }}"
-
-zun_wsproxy_image: "{{ docker_image_url }}zun-wsproxy"
-zun_wsproxy_tag: "{{ zun_tag }}"
-zun_wsproxy_image_full: "{{ zun_wsproxy_image }}:{{ zun_wsproxy_tag }}"
-
-zun_compute_image: "{{ docker_image_url }}zun-compute"
-zun_compute_tag: "{{ zun_tag }}"
-zun_compute_image_full: "{{ zun_compute_image }}:{{ zun_compute_tag }}"
-
-zun_cni_daemon_image: "{{ docker_image_url }}zun-cni-daemon"
-zun_cni_daemon_tag: "{{ zun_tag }}"
-zun_cni_daemon_image_full: "{{ zun_cni_daemon_image }}:{{ zun_cni_daemon_tag }}"
-
-
-zun_api_dimensions: "{{ default_container_dimensions }}"
-zun_wsproxy_dimensions: "{{ default_container_dimensions }}"
-zun_compute_dimensions: "{{ default_container_dimensions }}"
-zun_cni_daemon_dimensions: "{{ default_container_dimensions }}"
-
-zun_api_enable_healthchecks: "{{ enable_container_healthchecks }}"
-zun_api_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
-zun_api_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
-zun_api_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
-zun_api_healthcheck_test: ["CMD-SHELL", "healthcheck_curl http://{{ api_interface_address | put_address_in_context('url') }}:{{ zun_api_port }}/healthcheck"]
-zun_api_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
-zun_api_healthcheck:
-  interval: "{{ zun_api_healthcheck_interval }}"
-  retries: "{{ zun_api_healthcheck_retries }}"
-  start_period: "{{ zun_api_healthcheck_start_period }}"
-  test: "{% if zun_api_enable_healthchecks | bool %}{{ zun_api_healthcheck_test }}{% else %}NONE{% endif %}"
-  timeout: "{{ zun_api_healthcheck_timeout }}"
-
-zun_wsproxy_enable_healthchecks: "{{ enable_container_healthchecks }}"
-zun_wsproxy_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
-zun_wsproxy_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
-zun_wsproxy_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
-zun_wsproxy_healthcheck_test: ["CMD-SHELL", "healthcheck_listen zun-wsproxy {{ zun_wsproxy_port }}"]
-zun_wsproxy_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
-zun_wsproxy_healthcheck:
-  interval: "{{ zun_wsproxy_healthcheck_interval }}"
-  retries: "{{ zun_wsproxy_healthcheck_retries }}"
-  start_period: "{{ zun_wsproxy_healthcheck_start_period }}"
-  test: "{% if zun_wsproxy_enable_healthchecks | bool %}{{ zun_wsproxy_healthcheck_test }}{% else %}NONE{% endif %}"
-  timeout: "{{ zun_wsproxy_healthcheck_timeout }}"
-
-zun_compute_enable_healthchecks: "{{ enable_container_healthchecks }}"
-zun_compute_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
-zun_compute_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
-zun_compute_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
-zun_compute_healthcheck_test: ["CMD-SHELL", "healthcheck_port zun-compute {{ om_rpc_port }}"]
-zun_compute_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
-zun_compute_healthcheck:
-  interval: "{{ zun_compute_healthcheck_interval }}"
-  retries: "{{ zun_compute_healthcheck_retries }}"
-  start_period: "{{ zun_compute_healthcheck_start_period }}"
-  test: "{% if zun_compute_enable_healthchecks | bool %}{{ zun_compute_healthcheck_test }}{% else %}NONE{% endif %}"
-  timeout: "{{ zun_compute_healthcheck_timeout }}"
-
-zun_cni_daemon_enable_healthchecks: "{{ enable_container_healthchecks }}"
-zun_cni_daemon_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
-zun_cni_daemon_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
-zun_cni_daemon_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
-zun_cni_daemon_healthcheck_test: ["CMD-SHELL", "healthcheck_listen zun-cni-daemon {{ zun_cni_daemon_port }}"]
-zun_cni_daemon_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
-zun_cni_daemon_healthcheck:
-  interval: "{{ zun_cni_daemon_healthcheck_interval }}"
-  retries: "{{ zun_cni_daemon_healthcheck_retries }}"
-  start_period: "{{ zun_cni_daemon_healthcheck_start_period }}"
-  test: "{% if zun_cni_daemon_enable_healthchecks | bool %}{{ zun_cni_daemon_healthcheck_test }}{% else %}NONE{% endif %}"
-  timeout: "{{ zun_cni_daemon_healthcheck_timeout }}"
-
-zun_api_default_volumes:
-  - "{{ node_config_directory }}/zun-api/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ kolla_dev_repos_directory ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}"
-  - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' }}"
-zun_wsproxy_default_volumes:
-  - "{{ node_config_directory }}/zun-wsproxy/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "{{ kolla_dev_repos_directory ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}"
-  - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' }}"
-zun_compute_default_volumes:
-  - "{{ node_config_directory }}/zun-compute/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "kolla_logs:/var/log/kolla/"
-  - "{{ kolla_dev_repos_directory ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}"
-  - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}"
-  - "/usr/lib/docker:/usr/lib/docker"
-  - "/var/lib/docker:/var/lib/docker"
-  - "/lib/modules:/lib/modules:ro"
-  - "/dev:/dev"
-  - "{% if enable_iscsid | bool %}iscsi_info:/etc/iscsi{% endif %}"
-  - "{% if zun_configure_for_cinder_ceph | bool %}/var/lib/zun:/var/lib/zun:shared{% endif %}"
-zun_cni_daemon_default_volumes:
-  - "{{ node_config_directory }}/zun-cni-daemon/:{{ container_config_directory }}/:ro"
-  - "/etc/localtime:/etc/localtime:ro"
-  - "kolla_logs:/var/log/kolla/"
-  - "{{ '/dev/shm:/dev/shm' }}"
-  - "{{ kolla_dev_repos_directory ~ '/zun:/dev-mode/zun' if zun_dev_mode | bool else '' }}"
-  - "/run:/run{{ ':shared' if kolla_container_engine == 'docker' else '' }}"
-
-zun_extra_volumes: "{{ default_extra_volumes }}"
-zun_api_extra_volumes: "{{ zun_extra_volumes }}"
-zun_wsproxy_extra_volumes: "{{ zun_extra_volumes }}"
-zun_compute_extra_volumes: "{{ zun_extra_volumes }}"
-zun_cni_daemon_extra_volumes: "{{ zun_extra_volumes }}"
-
-####################
-## OpenStack
-####################
-zun_internal_endpoint: "{{ zun_internal_base_endpoint }}/v1/"
-zun_public_endpoint: "{{ zun_public_base_endpoint }}/v1/"
-
-zun_logging_debug: "{{ openstack_logging_debug }}"
-
-zun_keystone_user: "zun"
-
-openstack_zun_auth: "{{ openstack_auth }}"
-
-zun_api_workers: "{{ openstack_service_workers }}"
-
-####################
-# Kolla
-####################
-zun_git_repository: "{{ kolla_dev_repos_git }}/{{ project_name }}"
-zun_dev_repos_pull: "{{ kolla_dev_repos_pull }}"
-zun_dev_mode: "{{ kolla_dev_mode }}"
-zun_source_version: "{{ kolla_source_version }}"
-
-####################
-# Keystone
-####################
-zun_ks_services:
-  - name: "zun"
-    type: "container"
-    description: "Container Service"
-    endpoints:
-      - {'interface': 'internal', 'url': '{{ zun_internal_endpoint }}'}
-      - {'interface': 'public', 'url': '{{ zun_public_endpoint }}'}
-
-zun_ks_users:
-  - project: "service"
-    user: "{{ zun_keystone_user }}"
-    password: "{{ zun_keystone_password }}"
-    role: "admin"
-
-zun_ceph_cluster: "ceph"
-
-# Database
-zun_database_enable_tls_internal: "{{ database_enable_tls_internal | bool }}"
-
-###################
-# Copy certificates
-###################
-zun_copy_certs: "{{ kolla_copy_ca_into_containers | bool or zun_database_enable_tls_internal | bool }}"
diff --git a/ansible/roles/zun/handlers/main.yml b/ansible/roles/zun/handlers/main.yml
deleted file mode 100644
index 9185a70cb..000000000
--- a/ansible/roles/zun/handlers/main.yml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-- name: Restart zun-api container
-  vars:
-    service_name: "zun-api"
-    service: "{{ zun_services[service_name] }}"
-  become: true
-  kolla_container:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    privileged: "{{ service.privileged | default(False) }}"
-    volumes: "{{ service.volumes | reject('equalto', '') | list }}"
-    dimensions: "{{ service.dimensions }}"
-    healthcheck: "{{ service.healthcheck | default(omit) }}"
-
-- name: Restart zun-wsproxy container
-  vars:
-    service_name: "zun-wsproxy"
-    service: "{{ zun_services[service_name] }}"
-  become: true
-  kolla_container:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    privileged: "{{ service.privileged | default(False) }}"
-    volumes: "{{ service.volumes | reject('equalto', '') | list }}"
-    dimensions: "{{ service.dimensions }}"
-    healthcheck: "{{ service.healthcheck | default(omit) }}"
-
-- name: Restart zun-compute container
-  vars:
-    service_name: "zun-compute"
-    service: "{{ zun_services[service_name] }}"
-  become: true
-  kolla_container:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    privileged: "{{ service.privileged | default(False) }}"
-    volumes: "{{ service.volumes | reject('equalto', '') | list }}"
-    dimensions: "{{ service.dimensions }}"
-    healthcheck: "{{ service.healthcheck | default(omit) }}"
-
-- name: Restart zun-cni-daemon container
-  vars:
-    service_name: "zun-cni-daemon"
-    service: "{{ zun_services[service_name] }}"
-  become: true
-  kolla_container:
-    action: "recreate_or_restart_container"
-    common_options: "{{ docker_common_options }}"
-    name: "{{ service.container_name }}"
-    image: "{{ service.image }}"
-    privileged: "{{ service.privileged | default(False) }}"
-    volumes: "{{ service.volumes | reject('equalto', '') | list }}"
-    dimensions: "{{ service.dimensions }}"
-    healthcheck: "{{ service.healthcheck | default(omit) }}"
-
-- name: Copy loopback binary from zun-cni-daemon container to host
-  vars:
-    service_name: "zun-cni-daemon"
-    service: "{{ zun_services[service_name] }}"
-  become: true
-  changed_when: true
-  ansible.builtin.command: "{{ kolla_container_engine }} cp {{ service.container_name }}:/opt/loopback /opt/cni/bin/"
-  # NOTE(yoctozepto): it would be cleaner to listen only on image change
-  # but there is no such mechanism (yet)
-  listen:
-    - Restart zun-cni-daemon container
diff --git a/ansible/roles/zun/tasks/bootstrap.yml b/ansible/roles/zun/tasks/bootstrap.yml
deleted file mode 100644
index dca9cd489..000000000
--- a/ansible/roles/zun/tasks/bootstrap.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- name: Creating Zun database
-  become: true
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: mysql_db
-    module_args:
-      ca_cert: "{{ openstack_cacert if database_enable_tls_internal | bool else omit }}"
-      login_host: "{{ database_address }}"
-      login_port: "{{ database_port }}"
-      login_user: "{{ zun_database_shard_root_user }}"
-      login_password: "{{ database_password }}"
-      name: "{{ zun_database_name }}"
-  run_once: true
-  delegate_to: "{{ groups['zun-api'][0] }}"
-  when:
-    - not use_preconfigured_databases | bool
-
-- name: Creating Zun database user and setting permissions
-  become: true
-  kolla_toolbox:
-    container_engine: "{{ kolla_container_engine }}"
-    module_name: mysql_user
-    module_args:
-      ca_cert: "{{ openstack_cacert if database_enable_tls_internal | bool else omit }}"
-      login_host: "{{ database_address }}"
-      login_port: "{{ database_port }}"
-      login_user: "{{ zun_database_shard_root_user }}"
-      login_password: "{{ database_password }}"
-      name: "{{ zun_database_user }}"
-      password: "{{ zun_database_password }}"
-      host: "%"
-      priv: "{{ zun_database_name }}.*:ALL"
-      append_privs: "yes"
-  run_once: true
-  delegate_to: "{{ groups['zun-api'][0] }}"
-  when:
-    - not use_preconfigured_databases | bool
-
-- name: Run zun bootstrap container
-  ansible.builtin.import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/zun/tasks/bootstrap_service.yml b/ansible/roles/zun/tasks/bootstrap_service.yml
deleted file mode 100644
index b68dc002a..000000000
--- a/ansible/roles/zun/tasks/bootstrap_service.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: Running Zun bootstrap container
-  vars:
-    zun_api: "{{ zun_services['zun-api'] }}"
-  become: true
-  kolla_container:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: false
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ zun_api.image }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_zun"
-    restart_policy: oneshot
-    volumes: "{{ zun_api.volumes | reject('equalto', '') | list }}"
-  run_once: true
-  delegate_to: "{{ groups[zun_api.group][0] }}"
diff --git a/ansible/roles/zun/tasks/check-containers.yml b/ansible/roles/zun/tasks/check-containers.yml
deleted file mode 100644
index 59ab0b491..000000000
--- a/ansible/roles/zun/tasks/check-containers.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: Check zun containers
-  ansible.builtin.import_role:
-    name: service-check-containers
diff --git a/ansible/roles/zun/tasks/check.yml b/ansible/roles/zun/tasks/check.yml
deleted file mode 100644
index b2bde3bf9..000000000
--- a/ansible/roles/zun/tasks/check.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: Checking Zun containers
-  ansible.builtin.import_role:
-    role: service-check
diff --git a/ansible/roles/zun/tasks/clone.yml b/ansible/roles/zun/tasks/clone.yml
deleted file mode 100644
index 629f06e7e..000000000
--- a/ansible/roles/zun/tasks/clone.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Cloning zun source repository for development
-  become: true
-  ansible.builtin.git:
-    repo: "{{ zun_git_repository }}"
-    dest: "{{ kolla_dev_repos_directory }}/{{ project_name }}"
-    update: "{{ zun_dev_repos_pull }}"
-    version: "{{ zun_source_version }}"
diff --git a/ansible/roles/zun/tasks/config.yml b/ansible/roles/zun/tasks/config.yml
deleted file mode 100644
index 1f5014812..000000000
--- a/ansible/roles/zun/tasks/config.yml
+++ /dev/null
@@ -1,88 +0,0 @@
----
-- name: Ensuring config directories exist
-  ansible.builtin.file:
-    path: "{{ node_config_directory }}/{{ item.key }}"
-    state: "directory"
-    owner: "{{ config_owner_user }}"
-    group: "{{ config_owner_group }}"
-    mode: "0770"
-  become: true
-  with_dict: "{{ zun_services | select_services_enabled_and_mapped_to_host }}"
-
-- name: Include tasks from external_ceph.yml
-  ansible.builtin.include_tasks: external_ceph.yml
-  when:
-    - zun_configure_for_cinder_ceph | bool
-    - inventory_hostname in groups['zun-compute']
-
-- name: Check if policies shall be overwritten
-  ansible.builtin.stat:
-    path: "{{ item }}"
-  run_once: true
-  delegate_to: localhost
-  register: zun_policy
-  with_first_found:
-    - files: "{{ supported_policy_format_list }}"
-      paths:
-        - "{{ node_custom_config }}/zun/"
-      skip: true
-
-- name: Set zun policy file
-  ansible.builtin.set_fact:
-    zun_policy_file: "{{ zun_policy.results.0.stat.path | basename }}"
-    zun_policy_file_path: "{{ zun_policy.results.0.stat.path }}"
-  when:
-    - zun_policy.results | length > 0
-
-- name: Copying over TLS certificates
-  ansible.builtin.include_tasks: copy-certs.yml
-  when:
-    - zun_copy_certs | bool
-
-- name: Copying over config.json files for services
-  ansible.builtin.template:
-    src: "{{ item.key }}.json.j2"
-    dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
-    mode: "0660"
-  become: true
-  with_dict: "{{ zun_services | select_services_enabled_and_mapped_to_host }}"
-
-- name: Copying over zun.conf
-  vars:
-    service_name: "{{ item.key }}"
-  merge_configs:
-    sources:
-      - "{{ role_path }}/templates/zun.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/zun.conf"
-      - "{{ node_custom_config }}/zun/{{ item.key }}.conf"
-      - "{{ node_custom_config }}/zun/{{ inventory_hostname }}/zun.conf"
-    dest: "{{ node_config_directory }}/{{ item.key }}/zun.conf"
-    mode: "0660"
-  become: true
-  with_dict: "{{ zun_services | select_services_enabled_and_mapped_to_host }}"
-
-- name: "Configure uWSGI for zun-api"
-  ansible.builtin.include_role:
-    name: service-uwsgi-config
-  vars:
-    project_services: "{{ zun_services }}"
-    service: "{{ zun_services['zun-api'] }}"
-    service_name: "zun-api"
-    service_uwsgi_config_http_port: "{{ zun_api_listen_port }}"
-    service_uwsgi_config_log_file_chmod: "644"
-    service_uwsgi_config_module: "{{ service.wsgi }}"
-    service_uwsgi_config_uid: "zun"
-    service_uwsgi_config_workers: "{{ zun_api_workers }}"
-  when:
-    - service | service_enabled_and_mapped_to_host
-
-- name: Copying over existing policy file
-  ansible.builtin.template:
-    src: "{{ zun_policy_file_path }}"
-    dest: "{{ node_config_directory }}/{{ item.key }}/{{ zun_policy_file }}"
-    mode: "0660"
-  become: true
-  when:
-    - zun_policy_file is defined
-  with_dict: "{{ zun_services | select_services_enabled_and_mapped_to_host }}"
diff --git a/ansible/roles/zun/tasks/config_validate.yml b/ansible/roles/zun/tasks/config_validate.yml
deleted file mode 100644
index e9352fb36..000000000
--- a/ansible/roles/zun/tasks/config_validate.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Validate zun configuration
-  ansible.builtin.import_role:
-    name: service-config-validate
-  vars:
-    service_config_validate_services: "{{ zun_services }}"
-    service_name: "{{ project_name }}"
-    service_config_validation: "{{ zun_config_validation }}"
diff --git a/ansible/roles/zun/tasks/copy-certs.yml b/ansible/roles/zun/tasks/copy-certs.yml
deleted file mode 100644
index 080eb08c4..000000000
--- a/ansible/roles/zun/tasks/copy-certs.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: "Copy certificates and keys for {{ project_name }}"
-  ansible.builtin.import_role:
-    role: service-cert-copy
-  vars:
-    project_services: "{{ zun_services }}"
diff --git a/ansible/roles/zun/tasks/deploy-containers.yml b/ansible/roles/zun/tasks/deploy-containers.yml
deleted file mode 100644
index 628fb9730..000000000
--- a/ansible/roles/zun/tasks/deploy-containers.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: Check zun containers
-  ansible.builtin.import_tasks: check-containers.yml
diff --git a/ansible/roles/zun/tasks/deploy.yml b/ansible/roles/zun/tasks/deploy.yml
deleted file mode 100644
index 06db29b41..000000000
--- a/ansible/roles/zun/tasks/deploy.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Register zun in Keystone
-  ansible.builtin.import_tasks: register.yml
-
-- name: Configure zun
-  ansible.builtin.import_tasks: config.yml
-
-- name: Check zun containers
-  ansible.builtin.import_tasks: check-containers.yml
-
-- name: Clone zun repository
-  ansible.builtin.include_tasks: clone.yml
-  when: zun_dev_mode | bool
-
-- name: Bootstrap zun service
-  ansible.builtin.import_tasks: bootstrap.yml
-
-- name: Flush handlers
-  ansible.builtin.meta: flush_handlers
diff --git a/ansible/roles/zun/tasks/external_ceph.yml b/ansible/roles/zun/tasks/external_ceph.yml
deleted file mode 100644
index ec0c20543..000000000
--- a/ansible/roles/zun/tasks/external_ceph.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Copying over ceph.conf for Zun
-  ansible.builtin.copy:
-    src: "{{ node_custom_config }}/zun/zun-compute/{{ ceph_cluster }}.conf"
-    dest: "{{ node_config_directory }}/zun-compute/"
-    mode: "0660"
-  become: true
-
-- name: Copy over Ceph keyring files for zun-compute
-  ansible.builtin.copy:
-    src: "{{ node_custom_config }}/zun/zun-compute/{{ ceph_cluster }}.client.{{ ceph_cinder_user }}.keyring"
-    dest: "{{ node_config_directory }}/zun-compute/"
-    mode: "0660"
-  become: true
-  when: external_ceph_cephx_enabled | bool
-
-- name: Ensuring config directory has correct owner and permission
-  become: true
-  ansible.builtin.file:
-    path: "{{ node_config_directory }}/zun-compute"
-    recurse: true
-    owner: "{{ config_owner_user }}"
-    group: "{{ config_owner_group }}"
diff --git a/ansible/roles/zun/tasks/loadbalancer.yml b/ansible/roles/zun/tasks/loadbalancer.yml
deleted file mode 100644
index 1f46646e0..000000000
--- a/ansible/roles/zun/tasks/loadbalancer.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: "Configure loadbalancer for {{ project_name }}"
-  ansible.builtin.import_role:
-    name: loadbalancer-config
-  vars:
-    project_services: "{{ zun_services }}"
-  tags: always
diff --git a/ansible/roles/zun/tasks/main.yml b/ansible/roles/zun/tasks/main.yml
deleted file mode 100644
index 594ad5d85..000000000
--- a/ansible/roles/zun/tasks/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: "Include tasks for action {{ kolla_action }}"
-  ansible.builtin.include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/zun/tasks/precheck.yml b/ansible/roles/zun/tasks/precheck.yml
deleted file mode 100644
index 7227fb056..000000000
--- a/ansible/roles/zun/tasks/precheck.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-- name: Precheck zun configuration
-  ansible.builtin.import_role:
-    name: service-precheck
-  vars:
-    service_precheck_services: "{{ zun_services }}"
-    service_name: "{{ project_name }}"
-
-- name: Get container facts
-  become: true
-  kolla_container_facts:
-    action: get_containers
-    container_engine: "{{ kolla_container_engine }}"
-    name:
-      - zun_api
-      - zun_wsproxy
-      - zun_cni_daemon
-  check_mode: false
-  register: container_facts
-
-- name: Checking free port for Zun API
-  ansible.builtin.wait_for:
-    host: "{{ api_interface_address }}"
-    port: "{{ zun_api_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['zun_api'] is not defined
-    - inventory_hostname in groups['zun-api']
-
-- name: Checking free port for Zun WSproxy
-  ansible.builtin.wait_for:
-    host: "{{ api_interface_address }}"
-    port: "{{ zun_wsproxy_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['zun_wsproxy'] is not defined
-    - inventory_hostname in groups['zun-wsproxy']
-
-- name: Checking free port for zun-cni-daemon
-  ansible.builtin.wait_for:
-    host: "{{ api_interface_address }}"
-    port: "{{ zun_cni_daemon_port }}"
-    connect_timeout: 1
-    timeout: 1
-    state: stopped
-  when:
-    - container_facts.containers['zun_cni_daemon'] is not defined
-    - inventory_hostname in groups['zun-cni-daemon']
-
-- name: Ensure kuryr enabled for zun
-  ansible.builtin.assert:
-    that: enable_kuryr | bool
-    fail_msg: "kuryr is required but not enabled"
-  run_once: true
-  when:
-    - enable_zun | bool
diff --git a/ansible/roles/zun/tasks/pull.yml b/ansible/roles/zun/tasks/pull.yml
deleted file mode 100644
index 9ce4db5dc..000000000
--- a/ansible/roles/zun/tasks/pull.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: Pull zun images
-  ansible.builtin.import_role:
-    role: service-images-pull
diff --git a/ansible/roles/zun/tasks/reconfigure.yml b/ansible/roles/zun/tasks/reconfigure.yml
deleted file mode 100644
index c324f9ff6..000000000
--- a/ansible/roles/zun/tasks/reconfigure.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: Deploy zun
-  ansible.builtin.import_tasks: deploy.yml
diff --git a/ansible/roles/zun/tasks/register.yml b/ansible/roles/zun/tasks/register.yml
deleted file mode 100644
index 8be6a98bf..000000000
--- a/ansible/roles/zun/tasks/register.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: Register zun service, endpoints, and users in Keystone
-  ansible.builtin.import_role:
-    name: service-ks-register
-  vars:
-    service_ks_register_auth: "{{ openstack_zun_auth }}"
-    service_ks_register_services: "{{ zun_ks_services }}"
-    service_ks_register_users: "{{ zun_ks_users }}"
diff --git a/ansible/roles/zun/tasks/stop.yml b/ansible/roles/zun/tasks/stop.yml
deleted file mode 100644
index cd749cc0f..000000000
--- a/ansible/roles/zun/tasks/stop.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- name: Stop zun containers
-  ansible.builtin.import_role:
-    name: service-stop
-  vars:
-    project_services: "{{ zun_services }}"
-    service_name: "{{ project_name }}"
diff --git a/ansible/roles/zun/tasks/upgrade.yml b/ansible/roles/zun/tasks/upgrade.yml
deleted file mode 100644
index afb48e1c3..000000000
--- a/ansible/roles/zun/tasks/upgrade.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: Configure zun
-  ansible.builtin.import_tasks: config.yml
-
-- name: Check zun containers
-  ansible.builtin.import_tasks: check-containers.yml
-
-- name: Run zun bootstrap container
-  ansible.builtin.import_tasks: bootstrap_service.yml
-
-- name: Flush handlers
-  ansible.builtin.meta: flush_handlers
diff --git a/ansible/roles/zun/templates/zun-api.json.j2 b/ansible/roles/zun/templates/zun-api.json.j2
deleted file mode 100644
index 27198a32b..000000000
--- a/ansible/roles/zun/templates/zun-api.json.j2
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "command": "uwsgi /etc/zun/zun-api-uwsgi.ini",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/zun.conf",
-            "dest": "/etc/zun/zun.conf",
-            "owner": "zun",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/zun-api-uwsgi.ini",
-            "dest": "/etc/zun/zun-api-uwsgi.ini",
-            "owner": "zun",
-            "perm": "0600"
-        }{% if zun_policy_file is defined %},
-        {
-            "source": "{{ container_config_directory }}/{{ zun_policy_file }}",
-            "dest": "/etc/zun/{{ zun_policy_file }}",
-            "owner": "zun",
-            "perm": "0600"
-        }{% endif %}{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/kolla/zun",
-            "owner": "zun:kolla",
-            "recurse": true
-        }
-    ]
-}
diff --git a/ansible/roles/zun/templates/zun-cni-daemon.json.j2 b/ansible/roles/zun/templates/zun-cni-daemon.json.j2
deleted file mode 100644
index 3e165e06b..000000000
--- a/ansible/roles/zun/templates/zun-cni-daemon.json.j2
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "command": "zun-cni-daemon --config-file /etc/zun/zun.conf",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/zun.conf",
-            "dest": "/etc/zun/zun.conf",
-            "owner": "zun",
-            "perm": "0600"
-        }{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/kolla/zun",
-            "owner": "zun:kolla",
-            "recurse": true
-        },
-        {
-            "path": "/opt/cni/",
-            "owner": "zun:kolla",
-            "recurse": true
-        }
-    ]
-}
diff --git a/ansible/roles/zun/templates/zun-compute.json.j2 b/ansible/roles/zun/templates/zun-compute.json.j2
deleted file mode 100644
index c9f9a7ccd..000000000
--- a/ansible/roles/zun/templates/zun-compute.json.j2
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "command": "zun-compute --config-file /etc/zun/zun.conf",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/zun.conf",
-            "dest": "/etc/zun/zun.conf",
-            "owner": "zun",
-            "perm": "0600"
-        },
-        {
-            "source": "{{ container_config_directory }}/{{ ceph_cluster }}.client.{{ ceph_cinder_user }}.keyring",
-            "dest": "/etc/ceph/{{ ceph_cluster }}.client.{{ ceph_cinder_user }}.keyring",
-            "owner": "zun",
-            "perm": "0600",
-            "optional": {{ (not zun_configure_for_cinder_ceph | bool) | string | lower }}
-        },
-        {
-            "source": "{{ container_config_directory }}/{{ ceph_cluster }}.conf",
-            "dest": "/etc/ceph/{{ ceph_cluster }}.conf",
-            "owner": "zun",
-            "perm": "0600",
-            "optional": {{ (not zun_configure_for_cinder_ceph | bool) | string | lower }}
-        }{% if zun_policy_file is defined %},
-        {
-            "source": "{{ container_config_directory }}/{{ zun_policy_file }}",
-            "dest": "/etc/zun/{{ zun_policy_file }}",
-            "owner": "zun",
-            "perm": "0600"
-        }{% endif %}{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/kolla/zun",
-            "owner": "zun:kolla",
-            "recurse": true
-        }{% if zun_configure_for_cinder_ceph | bool %},
-        {
-            "path": "/var/lib/zun",
-            "owner": "zun:kolla"
-        }{% endif %}
-    ]
-}
diff --git a/ansible/roles/zun/templates/zun-wsproxy.json.j2 b/ansible/roles/zun/templates/zun-wsproxy.json.j2
deleted file mode 100644
index 89dd398b6..000000000
--- a/ansible/roles/zun/templates/zun-wsproxy.json.j2
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "command": "zun-wsproxy --config-file /etc/zun/zun.conf",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/zun.conf",
-            "dest": "/etc/zun/zun.conf",
-            "owner": "zun",
-            "perm": "0600"
-        }{% if zun_policy_file is defined %},
-        {
-            "source": "{{ container_config_directory }}/{{ zun_policy_file }}",
-            "dest": "/etc/zun/{{ zun_policy_file }}",
-            "owner": "zun",
-            "perm": "0600"
-        }{% endif %}{% if kolla_copy_ca_into_containers | bool %},
-        {
-            "source": "{{ container_config_directory }}/ca-certificates",
-            "dest": "/var/lib/kolla/share/ca-certificates",
-            "owner": "root",
-            "perm": "0600"
-        }{% endif %}
-    ],
-    "permissions": [
-        {
-            "path": "/var/log/kolla/zun",
-            "owner": "zun:kolla",
-            "recurse": true
-        }
-    ]
-}
diff --git a/ansible/roles/zun/templates/zun.conf.j2 b/ansible/roles/zun/templates/zun.conf.j2
deleted file mode 100644
index 2322dac7a..000000000
--- a/ansible/roles/zun/templates/zun.conf.j2
+++ /dev/null
@@ -1,144 +0,0 @@
-[DEFAULT]
-debug = {{ zun_logging_debug }}
-
-{% if service_name == 'zun-api' %}
-# Force zun-api.log or will use app.wsgi
-log_file = /var/log/kolla/zun/zun-api.log
-{% endif %}
-
-log_dir = /var/log/kolla/zun
-transport_url = {{ rpc_transport_url }}
-
-state_path = /var/lib/zun
-container_driver = docker
-capsule_driver = cri
-
-sandbox_image = k8s.gcr.io/pause:3.6
-
-[network]
-driver = kuryr
-
-[database]
-connection = mysql+pymysql://{{ zun_database_user }}:{{ zun_database_password }}@{{ zun_database_address }}/{{ zun_database_name }}{{ '?ssl_ca=' ~ openstack_cacert if zun_database_enable_tls_internal | bool }}
-connection_recycle_time = {{ database_connection_recycle_time }}
-max_pool_size = {{ database_max_pool_size }}
-max_retries = -1
-
-# NOTE(yoctozepto): despite what the docs say, both keystone_auth and
-# keystone_authtoken sections are used and Zun internals may use either -
-# - best keep them both in sync
-[keystone_auth]
-www_authenticate_uri = {{ keystone_public_url }}
-auth_url = {{ keystone_internal_url }}
-auth_type = password
-project_domain_id = {{ default_project_domain_id }}
-user_domain_id = {{ default_user_domain_id }}
-project_name = service
-username = {{ zun_keystone_user }}
-password = {{ zun_keystone_password }}
-service_token_roles_required = true
-region_name = {{ openstack_region_name }}
-cafile = {{ openstack_cacert }}
-
-{% if enable_memcached | bool %}
-memcache_security_strategy = {{ memcache_security_strategy }}
-memcache_secret_key = {{ memcache_secret_key }}
-memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
-{% endif %}
-
-# NOTE(yoctozepto): despite what the docs say, both keystone_auth and
-# keystone_authtoken sections are used and Zun internals may use either -
-# - best keep them both in sync
-[keystone_authtoken]
-service_type = container
-www_authenticate_uri = {{ keystone_public_url }}
-auth_url = {{ keystone_internal_url }}
-auth_type = password
-project_domain_id = {{ default_project_domain_id }}
-user_domain_id = {{ default_user_domain_id }}
-project_name = service
-username = {{ zun_keystone_user }}
-password = {{ zun_keystone_password }}
-service_token_roles_required = true
-region_name = {{ openstack_region_name }}
-cafile = {{ openstack_cacert }}
-
-{% if enable_memcached | bool %}
-memcache_security_strategy = {{ memcache_security_strategy }}
-memcache_secret_key = {{ memcache_secret_key }}
-memcached_servers = {% for host in groups['memcached'] %}{{ 'api' | kolla_address(host) | put_address_in_context('memcache') }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %}
-{% endif %}
-
-[zun_client]
-region_name = {{ openstack_region_name }}
-endpoint_type = internalURL
-ca_file = {{ openstack_cacert }}
-
-[glance_client]
-region_name = {{ openstack_region_name }}
-endpoint_type = internalURL
-ca_file = {{ openstack_cacert }}
-
-[neutron_client]
-region_name = {{ openstack_region_name }}
-endpoint_type = internalURL
-ca_file = {{ openstack_cacert }}
-
-[cinder_client]
-region_name = {{ openstack_region_name }}
-endpoint_type = internalURL
-ca_file = {{ openstack_cacert }}
-
-[placement_client]
-region_name = {{ openstack_region_name }}
-endpoint_type = internalURL
-ca_file = {{ openstack_cacert }}
-
-{% if enable_osprofiler | bool %}
-[profiler]
-enabled = true
-trace_sqlalchemy = true
-hmac_keys = {{ osprofiler_secret }}
-connection_string = {{ osprofiler_backend_connection_string }}
-{% endif %}
-
-[oslo_concurrency]
-lock_path = /var/lib/zun/tmp
-
-{% if zun_policy_file is defined %}
-[oslo_policy]
-policy_file = {{ zun_policy_file }}
-{% endif %}
-
-[compute]
-host_shared_with_nova = {{ inventory_hostname in groups['compute'] and enable_nova | bool and not enable_nova_fake | bool }}
-
-[websocket_proxy]
-wsproxy_host = {{ api_interface_address }}
-wsproxy_port = {{ zun_wsproxy_port }}
-base_url = {{ zun_wsproxy_protocol }}://{{ zun_external_fqdn | put_address_in_context('url') }}:{{ zun_wsproxy_port }}
-
-[docker]
-api_url = tcp://{{ api_interface_address | put_address_in_context('url') }}:2375
-docker_remote_api_host = {{ api_interface_address }}
-docker_remote_api_port = 2375
-
-[cni_daemon]
-cni_daemon_port = {{ zun_cni_daemon_port }}
-
-[oslo_messaging_rabbit]
-use_queue_manager = true
-{% if service_name == 'zun-api' %}
-processname = {{ service_name }}
-{% endif %}
-heartbeat_in_pthread = {{ service_name == 'zun-api' }}
-{% if om_enable_rabbitmq_tls | bool %}
-ssl = true
-ssl_ca_file = {{ om_rabbitmq_cacert }}
-{% endif %}
-rabbit_quorum_queue = true
-{% if om_enable_rabbitmq_stream_fanout | bool %}
-rabbit_stream_fanout = true
-rabbit_qos_prefetch_count = {{ om_rabbitmq_qos_prefetch_count }}
-{% endif %}
-rabbit_transient_quorum_queue = true
diff --git a/ansible/roles/zun/vars/main.yml b/ansible/roles/zun/vars/main.yml
deleted file mode 100644
index 6be04f59f..000000000
--- a/ansible/roles/zun/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-project_name: "zun"
diff --git a/ansible/site.yml b/ansible/site.yml
index 911596dc1..baf4754fa 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -44,7 +44,6 @@
         - enable_ironic_{{ enable_ironic | bool }}
         - enable_iscsid_{{ enable_iscsid | bool }}
         - enable_keystone_{{ enable_keystone | bool }}
-        - enable_kuryr_{{ enable_kuryr | bool }}
         - enable_letsencrypt_{{ enable_letsencrypt | bool }}
         - enable_loadbalancer_{{ enable_loadbalancer | bool }}
         - enable_magnum_{{ enable_magnum | bool }}
@@ -69,7 +68,6 @@
         - enable_tacker_{{ enable_tacker | bool }}
         - enable_trove_{{ enable_trove | bool }}
         - enable_watcher_{{ enable_watcher | bool }}
-        - enable_zun_{{ enable_zun | bool }}
   tags: always
 
 - name: Apply role prechecks
@@ -379,12 +377,6 @@
             tasks_from: loadbalancer
           tags: watcher
           when: enable_watcher | bool
-        - name: Configure loadbalancer for zun
-          ansible.builtin.include_role:
-            name: zun
-            tasks_from: loadbalancer
-          tags: zun
-          when: enable_zun | bool
         # NOTE(r-krcek): This last step will notify handlers if any
         # changes to the configuration have been made.
         - name: Check loadbalancer containers
@@ -713,19 +705,6 @@
   roles:
     - { role: neutron, tags: neutron }
 
-- name: Apply role kuryr
-  gather_facts: false
-  hosts:
-    - compute
-    - "&enable_kuryr_True"
-  serial: '{{ kolla_serial|default("0") }}'
-  max_fail_percentage: >-
-    {{ kuryr_max_fail_percentage |
-       default(kolla_max_fail_percentage) |
-       default(100) }}
-  roles:
-    - { role: kuryr, tags: kuryr }
-
 - name: Apply role hacluster
   gather_facts: false
   hosts:
@@ -997,22 +976,6 @@
   roles:
     - { role: octavia, tags: octavia }
 
-- name: Apply role zun
-  gather_facts: false
-  hosts:
-    - zun-api
-    - zun-wsproxy
-    - zun-compute
-    - zun-cni-daemon
-    - "&enable_zun_True"
-  serial: '{{ kolla_serial|default("0") }}'
-  max_fail_percentage: >-
-    {{ zun_max_fail_percentage |
-       default(kolla_max_fail_percentage) |
-       default(100) }}
-  roles:
-    - { role: zun, tags: zun }
-
 - name: Apply role blazar
   gather_facts: false
   hosts: