openstack/kayobe
Code Issues Proposed changes

[release] Sync with Kolla Ansible for 2025.1

Browse Source 
Change-Id: Ib0a4b02f08cd43f0293f73aaaabfe732e2f6406a
This commit is contained in:
Pierre Riteau
2025-05-12 14:18:24 +02:00
parent f0609a8386
commit 741511f841
4 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/roles/kolla-ansible/templates/overcloud-components.j2
View File

@@ -91,9 +91,6 @@ control
[horizon:children] [horizon:children]
control control
[swift:children]
control
[barbican:children] [barbican:children]
control control

13
ansible/roles/kolla-ansible/templates/overcloud-services.j2
View File

@@ -162,19 +162,6 @@ network
[manila-data:children] [manila-data:children]
manila manila
# Swift
[swift-proxy-server:children]
swift
[swift-account-server:children]
storage
[swift-container-server:children]
storage
[swift-object-server:children]
storage
# Barbican # Barbican
[barbican-api:children] [barbican-api:children]
barbican barbican

8
ansible/roles/kolla-ansible/vars/main.yml
View File

@@ -88,6 +88,7 @@ kolla_feature_flags:
- ceph_rgw_loadbalancer - ceph_rgw_loadbalancer
- cinder - cinder
- cinder_backend_iscsi - cinder_backend_iscsi
- cinder_backend_lightbits
- cinder_backend_lvm - cinder_backend_lvm
- cinder_backend_nfs - cinder_backend_nfs
- cinder_backend_pure_fc - cinder_backend_pure_fc
@@ -135,10 +136,12 @@ kolla_feature_flags:
- horizon_octavia - horizon_octavia
- horizon_tacker - horizon_tacker
- horizon_trove - horizon_trove
- horizon_venus
- horizon_watcher - horizon_watcher
- horizon_zun - horizon_zun
- influxdb - influxdb
- ironic - ironic
- ironic_dnsmasq
- ironic_inspector - ironic_inspector
- ironic_neutron_agent - ironic_neutron_agent
- ironic_prometheus_exporter - ironic_prometheus_exporter
@@ -154,6 +157,7 @@ kolla_feature_flags:
- manila - manila
- manila_backend_cephfs_native - manila_backend_cephfs_native
- manila_backend_cephfs_nfs - manila_backend_cephfs_nfs
- manila_backend_flashblade
- manila_backend_generic - manila_backend_generic
- manila_backend_glusterfs_nfs - manila_backend_glusterfs_nfs
- manila_backend_hnas - manila_backend_hnas
@@ -200,6 +204,7 @@ kolla_feature_flags:
- openvswitch - openvswitch
- osprofiler - osprofiler
- ovn - ovn
- ovn_sb_db_relay
- ovs_dpdk - ovs_dpdk
- placement - placement
- prometheus - prometheus
@@ -225,9 +230,6 @@ kolla_feature_flags:
- rabbitmq - rabbitmq
- redis - redis
- skyline - skyline
- swift
- swift_recon
- swift_s3api
- tacker - tacker
- telegraf - telegraf
- trove - trove

8
etc/kayobe/kolla.yml
View File

@@ -291,6 +291,7 @@
#kolla_enable_ceph_rgw_loadbalancer: #kolla_enable_ceph_rgw_loadbalancer:
#kolla_enable_cinder: #kolla_enable_cinder:
#kolla_enable_cinder_backend_iscsi: #kolla_enable_cinder_backend_iscsi:
#kolla_enable_cinder_backend_lightbits:
#kolla_enable_cinder_backend_lvm: #kolla_enable_cinder_backend_lvm:
#kolla_enable_cinder_backend_nfs: #kolla_enable_cinder_backend_nfs:
#kolla_enable_cinder_backend_pure_fc: #kolla_enable_cinder_backend_pure_fc:
@@ -338,10 +339,12 @@
#kolla_enable_horizon_octavia: #kolla_enable_horizon_octavia:
#kolla_enable_horizon_tacker: #kolla_enable_horizon_tacker:
#kolla_enable_horizon_trove: #kolla_enable_horizon_trove:
#kolla_enable_horizon_venus:
#kolla_enable_horizon_watcher: #kolla_enable_horizon_watcher:
#kolla_enable_horizon_zun: #kolla_enable_horizon_zun:
#kolla_enable_influxdb: #kolla_enable_influxdb:
#kolla_enable_ironic: #kolla_enable_ironic:
#kolla_enable_ironic_dnsmasq:
#kolla_enable_ironic_inspector: #kolla_enable_ironic_inspector:
#kolla_enable_ironic_neutron_agent: #kolla_enable_ironic_neutron_agent:
#kolla_enable_ironic_prometheus_exporter: #kolla_enable_ironic_prometheus_exporter:
@@ -357,6 +360,7 @@
#kolla_enable_manila: #kolla_enable_manila:
#kolla_enable_manila_backend_cephfs_native: #kolla_enable_manila_backend_cephfs_native:
#kolla_enable_manila_backend_cephfs_nfs: #kolla_enable_manila_backend_cephfs_nfs:
#kolla_enable_manila_backend_flashblade:
#kolla_enable_manila_backend_generic: #kolla_enable_manila_backend_generic:
#kolla_enable_manila_backend_glusterfs_nfs: #kolla_enable_manila_backend_glusterfs_nfs:
#kolla_enable_manila_backend_hnas: #kolla_enable_manila_backend_hnas:
@@ -403,6 +407,7 @@
#kolla_enable_openvswitch: #kolla_enable_openvswitch:
#kolla_enable_osprofiler: #kolla_enable_osprofiler:
#kolla_enable_ovn: #kolla_enable_ovn:
#kolla_enable_ovn_sb_db_relay:
#kolla_enable_ovs_dpdk: #kolla_enable_ovs_dpdk:
#kolla_enable_placement: #kolla_enable_placement:
#kolla_enable_prometheus: #kolla_enable_prometheus:
@@ -428,9 +433,6 @@
#kolla_enable_rabbitmq: #kolla_enable_rabbitmq:
#kolla_enable_redis: #kolla_enable_redis:
#kolla_enable_skyline: #kolla_enable_skyline:
#kolla_enable_swift:
#kolla_enable_swift_recon:
#kolla_enable_swift_s3api:
#kolla_enable_tacker: #kolla_enable_tacker:
#kolla_enable_telegraf: #kolla_enable_telegraf:
#kolla_enable_trove: #kolla_enable_trove: