Synchronise master with upstream

README.rst

@@ -53,7 +53,6 @@ Kolla Ansible deploys containers for the following OpenStack projects:
 - `Horizon <https://docs.openstack.org/horizon/latest/>`__
 - `Ironic <https://docs.openstack.org/ironic/latest/>`__
 - `Keystone <https://docs.openstack.org/keystone/latest/>`__
-- `Kuryr <https://docs.openstack.org/kuryr/latest/>`__
 - `Magnum <https://docs.openstack.org/magnum/latest/>`__
 - `Manila <https://docs.openstack.org/manila/latest/>`__
 - `Masakari <https://docs.openstack.org/masakari/latest/>`__
@@ -65,7 +64,6 @@ Kolla Ansible deploys containers for the following OpenStack projects:
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
 - `Trove <https://docs.openstack.org/trove/latest/>`__
 - `Watcher <https://docs.openstack.org/watcher/latest/>`__
-- `Zun <https://docs.openstack.org/zun/latest/>`__
 
 Infrastructure components
 -------------------------

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

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"
 

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

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

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"

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

ansible/roles/fluentd/templates/conf/filter/01-rewrite.conf.j2

@@ -91,16 +91,6 @@
     pattern ^(octavia-api|octavia-health-manager|octavia-housekeeping|octavia-worker)$
     tag openstack_python
   </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)$

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 }}"