From 8fb9f57f5b570f175f967567580afe39e71a5437 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 15 Oct 2021 10:53:24 +0200
Subject: [PATCH] [release] Sync Kolla Ansible feature flags for Xena

Change-Id: I66917bb75b09295b70caf44d593a047b65b8433d
---
 ansible/roles/kolla-ansible/vars/main.yml | 10 +++++-----
 etc/kayobe/kolla.yml                      | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index 08874b81b..8c1612f9b 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -79,14 +79,14 @@ kolla_feature_flags:
   - ceilometer_ipmi
   - cells
   - central_logging
-  - chrony
+  - ceph_rgw
+  - ceph_rgw_loadbalancer
   - cinder
   - cinder_backend_hnas_nfs
   - cinder_backend_iscsi
   - cinder_backend_lvm
   - cinder_backend_nfs
   - cinder_backend_quobyte
-  - cinder_backend_zfssa_iscsi
   - cinder_backup
   - cinder_horizon_policy_file
   - cloudkitty
@@ -148,6 +148,7 @@ kolla_feature_flags:
   - keystone_horizon_policy_file
   - kibana
   - kuryr
+  - loadbalancer
   - magnum
   - manila
   - manila_backend_cephfs_native
@@ -171,6 +172,7 @@ kolla_feature_flags:
   - neutron_infoblox_ipam_agent
   - neutron_metering
   - neutron_mlnx
+  - neutron_packet_logging
   - neutron_port_forwarding
   - neutron_provider_networks
   - neutron_qos
@@ -192,7 +194,6 @@ kolla_feature_flags:
   - outward_rabbitmq
   - ovn
   - ovs_dpdk
-  - panko
   - placement
   - prometheus
   - prometheus_alertmanager
@@ -200,6 +201,7 @@ kolla_feature_flags:
   - prometheus_cadvisor
   - prometheus_ceph_mgr_exporter
   - prometheus_elasticsearch_exporter
+  - prometheus_fluentd_integration
   - prometheus_haproxy_exporter
   - prometheus_memcached_exporter
   - prometheus_mysqld_exporter
@@ -209,7 +211,6 @@ kolla_feature_flags:
   - prometheus_server
   - qdrouterd
   - rabbitmq
-  - rally
   - redis
   - sahara
   - senlin
@@ -221,7 +222,6 @@ kolla_feature_flags:
   - swift_s3api
   - tacker
   - telegraf
-  - tempest
   - trove
   - trove_singletenant
   - vitrage
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 302769977..3f910058c 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -258,14 +258,14 @@
 #kolla_enable_ceilometer_ipmi:
 #kolla_enable_cells:
 #kolla_enable_central_logging:
-#kolla_enable_chrony:
+#kolla_enable_ceph_rgw:
+#kolla_enable_ceph_rgw_loadbalancer:
 #kolla_enable_cinder:
 #kolla_enable_cinder_backend_hnas_nfs:
 #kolla_enable_cinder_backend_iscsi:
 #kolla_enable_cinder_backend_lvm:
 #kolla_enable_cinder_backend_nfs:
 #kolla_enable_cinder_backend_quobyte:
-#kolla_enable_cinder_backend_zfssa_iscsi:
 #kolla_enable_cinder_backup:
 #kolla_enable_cinder_horizon_policy_file:
 #kolla_enable_cloudkitty:
@@ -327,6 +327,7 @@
 #kolla_enable_keystone_horizon_policy_file:
 #kolla_enable_kibana:
 #kolla_enable_kuryr:
+#kolla_enable_loadbalancer:
 #kolla_enable_magnum:
 #kolla_enable_manila:
 #kolla_enable_manila_backend_cephfs_native:
@@ -350,6 +351,7 @@
 #kolla_enable_neutron_infoblox_ipam_agent:
 #kolla_enable_neutron_metering:
 #kolla_enable_neutron_mlnx:
+#kolla_enable_neutron_packet_logging:
 #kolla_enable_neutron_port_forwarding:
 #kolla_enable_neutron_provider_networks:
 #kolla_enable_neutron_qos:
@@ -371,7 +373,6 @@
 #kolla_enable_outward_rabbitmq:
 #kolla_enable_ovn:
 #kolla_enable_ovs_dpdk:
-#kolla_enable_panko:
 #kolla_enable_placement:
 #kolla_enable_prometheus:
 #kolla_enable_prometheus_alertmanager:
@@ -379,6 +380,7 @@
 #kolla_enable_prometheus_cadvisor:
 #kolla_enable_prometheus_ceph_mgr_exporter:
 #kolla_enable_prometheus_elasticsearch_exporter:
+#kolla_enable_prometheus_fluentd_integration:
 #kolla_enable_prometheus_haproxy_exporter:
 #kolla_enable_prometheus_memcached_exporter:
 #kolla_enable_prometheus_mysqld_exporter:
@@ -388,7 +390,6 @@
 #kolla_enable_prometheus_server:
 #kolla_enable_qdrouterd:
 #kolla_enable_rabbitmq:
-#kolla_enable_rally:
 #kolla_enable_redis:
 #kolla_enable_sahara:
 #kolla_enable_senlin:
@@ -400,7 +401,6 @@
 #kolla_enable_swift_s3api:
 #kolla_enable_tacker:
 #kolla_enable_telegraf:
-#kolla_enable_tempest:
 #kolla_enable_trove:
 #kolla_enable_trove_singletenant:
 #kolla_enable_vitrage: