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

Author: Zuul

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

@@ -151,14 +151,11 @@ control
 [skyline:children]
 control
 
-[redis:children]
+[valkey:children]
 control
 
 [blazar:children]
 control
 
-[venus:children]
-monitoring
-
 [letsencrypt:children]
 loadbalancer

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

@@ -447,12 +447,6 @@ ovn-database
 [ovn-sb-db-relay:children]
 ovn-database
 
-[venus-api:children]
-venus
-
-[venus-manager:children]
-venus
-
 [letsencrypt-webserver:children]
 letsencrypt
 

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

@@ -136,14 +136,14 @@ kolla_feature_flags:
   - horizon_octavia
   - horizon_tacker
   - horizon_trove
-  - horizon_venus
   - horizon_watcher
   - horizon_zun
   - influxdb
   - ironic
   - ironic_dnsmasq
   - ironic_neutron_agent
   - ironic_prometheus_exporter
+  - ironic_pxe_filter
   - iscsid
   - keepalived
   - keystone
@@ -227,12 +227,11 @@ kolla_feature_flags:
   - prometheus_server
   - proxysql
   - rabbitmq
-  - redis
   - skyline
   - tacker
   - telegraf
   - trove
   - trove_singletenant
-  - venus
+  - valkey
   - watcher
   - zun

etc/kayobe/kolla.yml

@@ -284,7 +284,6 @@
 
 #kolla_enable_aodh:
 #kolla_enable_barbican:
-#kolla_enable_bifrost:
 #kolla_enable_blazar:
 #kolla_enable_ceilometer:
 #kolla_enable_ceilometer_horizon_policy_file:
@@ -344,14 +343,14 @@
 #kolla_enable_horizon_octavia:
 #kolla_enable_horizon_tacker:
 #kolla_enable_horizon_trove:
-#kolla_enable_horizon_venus:
 #kolla_enable_horizon_watcher:
 #kolla_enable_horizon_zun:
 #kolla_enable_influxdb:
 #kolla_enable_ironic:
 #kolla_enable_ironic_dnsmasq:
 #kolla_enable_ironic_neutron_agent:
 #kolla_enable_ironic_prometheus_exporter:
+#kolla_enable_ironic_pxe_filter:
 #kolla_enable_iscsid:
 #kolla_enable_keepalived:
 #kolla_enable_keystone:
@@ -435,13 +434,12 @@
 #kolla_enable_prometheus_server:
 #kolla_enable_proxysql:
 #kolla_enable_rabbitmq:
-#kolla_enable_redis:
 #kolla_enable_skyline:
 #kolla_enable_tacker:
 #kolla_enable_telegraf:
 #kolla_enable_trove:
 #kolla_enable_trove_singletenant:
-#kolla_enable_venus:
+#kolla_enable_valkey:
 #kolla_enable_watcher:
 #kolla_enable_zun: