From c2186b1bd3da12a04a298d48e5bd442899440113 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Thu, 31 Mar 2022 07:29:35 +0200
Subject: [PATCH] [release] Sync Kolla Ansible feature flags for Yoga

Change-Id: I174623bbcfeb35c59cd4c155f36078800d4c35cd
---
 ansible/roles/kolla-ansible/vars/main.yml | 4 ++++
 etc/kayobe/kolla.yml                      | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index 968c2222b..aed9f6cd9 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -77,6 +77,7 @@ kolla_feature_flags:
   - ceilometer
   - ceilometer_horizon_policy_file
   - ceilometer_ipmi
+  - ceilometer_prometheus_pushgateway
   - cells
   - central_logging
   - ceph_rgw
@@ -202,8 +203,10 @@ kolla_feature_flags:
   - prometheus_cadvisor
   - prometheus_ceph_mgr_exporter
   - prometheus_elasticsearch_exporter
+  - prometheus_etcd_integration
   - prometheus_fluentd_integration
   - prometheus_haproxy_exporter
+  - prometheus_libvirt_exporter
   - prometheus_memcached_exporter
   - prometheus_mysqld_exporter
   - prometheus_node_exporter
@@ -225,6 +228,7 @@ kolla_feature_flags:
   - telegraf
   - trove
   - trove_singletenant
+  - venus
   - vitrage
   - vitrage_prometheus_datasource
   - watcher
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 01d2a8da9..42f23d150 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -262,6 +262,7 @@
 #kolla_enable_ceilometer:
 #kolla_enable_ceilometer_horizon_policy_file:
 #kolla_enable_ceilometer_ipmi:
+#kolla_enable_ceilometer_prometheus_pushgateway:
 #kolla_enable_cells:
 #kolla_enable_central_logging:
 #kolla_enable_ceph_rgw:
@@ -369,6 +370,7 @@
 #kolla_enable_nova:
 #kolla_enable_nova_fake:
 #kolla_enable_nova_horizon_policy_file:
+#kolla_enable_nova_libvirt_container:
 #kolla_enable_nova_serialconsole_proxy:
 #kolla_enable_nova_ssh:
 #kolla_enable_octavia:
@@ -386,8 +388,10 @@
 #kolla_enable_prometheus_cadvisor:
 #kolla_enable_prometheus_ceph_mgr_exporter:
 #kolla_enable_prometheus_elasticsearch_exporter:
+#kolla_enable_prometheus_etcd_integration:
 #kolla_enable_prometheus_fluentd_integration:
 #kolla_enable_prometheus_haproxy_exporter:
+#kolla_enable_prometheus_libvirt_exporter:
 #kolla_enable_prometheus_memcached_exporter:
 #kolla_enable_prometheus_mysqld_exporter:
 #kolla_enable_prometheus_node_exporter:
@@ -409,6 +413,7 @@
 #kolla_enable_telegraf:
 #kolla_enable_trove:
 #kolla_enable_trove_singletenant:
+#kolla_enable_venus:
 #kolla_enable_vitrage:
 #kolla_enable_vitrage_prometheus_datasource:
 #kolla_enable_watcher: