Merge "[release] Sync with Kolla Ansible for 2024.2"

ansible/roles/kolla-ansible/templates/overcloud-services.j2

@@ -416,9 +416,6 @@ monitoring
 [prometheus-libvirt-exporter:children]
 compute
 
-[prometheus-msteams:children]
-prometheus-alertmanager
-
 [masakari-api:children]
 control
 

ansible/roles/kolla-ansible/vars/main.yml

@@ -87,12 +87,12 @@ kolla_feature_flags:
   - ceph_rgw
   - ceph_rgw_loadbalancer
   - cinder
-  - cinder_backend_hnas_nfs
   - cinder_backend_iscsi
   - cinder_backend_lvm
   - cinder_backend_nfs
   - cinder_backend_pure_fc
   - cinder_backend_pure_iscsi
+  - cinder_backend_pure_nvme_tcp
   - cinder_backend_pure_roce
   - cinder_backend_quobyte
   - cinder_backup
@@ -213,11 +213,11 @@ kolla_feature_flags:
   - prometheus_haproxy_exporter
   - prometheus_libvirt_exporter
   - prometheus_memcached_exporter
-  - prometheus_msteams
   - prometheus_mysqld_exporter
   - prometheus_node_exporter
   - prometheus_openstack_exporter
   - prometheus_openstack_exporter_external
+  - prometheus_proxysql_exporter
   - prometheus_rabbitmq_exporter
   - prometheus_server
   - proxysql

etc/kayobe/kolla.yml

@@ -290,12 +290,12 @@
 #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_pure_fc:
 #kolla_enable_cinder_backend_pure_iscsi:
+#kolla_enable_cinder_backend_pure_nvme_tcp:
 #kolla_enable_cinder_backend_pure_roce:
 #kolla_enable_cinder_backend_quobyte:
 #kolla_enable_cinder_backup:
@@ -416,11 +416,11 @@
 #kolla_enable_prometheus_haproxy_exporter:
 #kolla_enable_prometheus_libvirt_exporter:
 #kolla_enable_prometheus_memcached_exporter:
-#kolla_enable_prometheus_msteams:
 #kolla_enable_prometheus_mysqld_exporter:
 #kolla_enable_prometheus_node_exporter:
 #kolla_enable_prometheus_openstack_exporter:
 #kolla_enable_prometheus_openstack_exporter_external:
+#kolla_enable_prometheus_proxysql_exporter:
 #kolla_enable_prometheus_rabbitmq_exporter:
 #kolla_enable_prometheus_server:
 #kolla_enable_proxysql: