openstack/kayobe
Code Issues Proposed changes

[release] Sync with Kolla Ansible for 2024.1

Browse Source 
Change-Id: Ia2a513ec7b14c52e1a89add2f3ba0c5e8e0202ea
This commit is contained in:
Pierre Riteau
2024-05-29 10:51:50 +02:00
parent 9a5d572a09
commit 3f238df073
4 changed files with 8 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,9 +62,6 @@ control
[rabbitmq:children] [rabbitmq:children]
control control
[outward-rabbitmq:children]
control
[keystone:children] [keystone:children]
control control
@@ -88,9 +85,6 @@ control
[cloudkitty:children] [cloudkitty:children]
control control
[freezer:children]
control
[memcached:children] [memcached:children]
control control
@@ -106,21 +100,12 @@ control
[heat:children] [heat:children]
control control
[murano:children]
control
[solum:children]
control
[ironic:children] [ironic:children]
control control
[magnum:children] [magnum:children]
control control
[sahara:children]
control
[mistral:children] [mistral:children]
control control
@@ -146,12 +131,6 @@ control
[trove:children] [trove:children]
control control
[senlin:children]
control
[vitrage:children]
control
[watcher:children] [watcher:children]
control control

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

@@ -137,13 +137,6 @@ cloudkitty
[cloudkitty-processor:children] [cloudkitty-processor:children]
cloudkitty cloudkitty
# Freezer
[freezer-api:children]
freezer
[freezer-scheduler:children]
freezer
# iSCSI # iSCSI
[iscsid:children] [iscsid:children]
compute compute
@@ -199,13 +192,6 @@ heat
[heat-engine:children] [heat-engine:children]
heat heat
# Murano
[murano-api:children]
murano
[murano-engine:children]
murano
# Ironic # Ironic
[ironic-api:children] [ironic-api:children]
ironic ironic
@@ -234,32 +220,6 @@ magnum
[magnum-conductor:children] [magnum-conductor:children]
magnum magnum
# Sahara
[sahara-api:children]
sahara
[sahara-engine:children]
sahara
# Solum
[solum-api:children]
solum
[solum-worker:children]
solum
[solum-deployer:children]
solum
[solum-conductor:children]
solum
[solum-application-deployment:children]
solum
[solum-image-builder:children]
solum
# Mistral # Mistral
[mistral-api:children] [mistral-api:children]
mistral mistral
@@ -344,19 +304,6 @@ watcher
[watcher-applier:children] [watcher-applier:children]
watcher watcher
# Senlin
[senlin-api:children]
senlin
[senlin-conductor:children]
senlin
[senlin-engine:children]
senlin
[senlin-health-manager:children]
senlin
# Octavia # Octavia
[octavia-api:children] [octavia-api:children]
octavia octavia
@@ -426,22 +373,6 @@ tacker
[tacker-conductor:children] [tacker-conductor:children]
tacker tacker
# Vitrage
[vitrage-api:children]
vitrage
[vitrage-notifier:children]
vitrage
[vitrage-graph:children]
vitrage
[vitrage-ml:children]
vitrage
[vitrage-persistor:children]
vitrage
# Blazar # Blazar
[blazar-api:children] [blazar-api:children]
blazar blazar
@@ -460,9 +391,6 @@ storage
[prometheus-mysqld-exporter:children] [prometheus-mysqld-exporter:children]
mariadb mariadb
[prometheus-haproxy-exporter:children]
loadbalancer
[prometheus-memcached-exporter:children] [prometheus-memcached-exporter:children]
memcached memcached

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

@@ -107,7 +107,7 @@ kolla_feature_flags:
- external_api_firewalld - external_api_firewalld
- external_mariadb_load_balancer - external_mariadb_load_balancer
- fluentd - fluentd
- freezer - fluentd_systemd
- glance - glance
- glance_horizon_policy_file - glance_horizon_policy_file
- glance_image_cache - glance_image_cache
@@ -124,29 +124,23 @@ kolla_feature_flags:
- horizon_blazar - horizon_blazar
- horizon_cloudkitty - horizon_cloudkitty
- horizon_designate - horizon_designate
- horizon_freezer - horizon_fwaas
- horizon_heat - horizon_heat
- horizon_ironic - horizon_ironic
- horizon_magnum - horizon_magnum
- horizon_manila - horizon_manila
- horizon_masakari - horizon_masakari
- horizon_mistral - horizon_mistral
- horizon_murano
- horizon_neutron_vpnaas - horizon_neutron_vpnaas
- horizon_octavia - horizon_octavia
- horizon_sahara
- horizon_senlin
- horizon_solum
- horizon_tacker - horizon_tacker
- horizon_trove - horizon_trove
- horizon_vitrage
- horizon_watcher - horizon_watcher
- horizon_zun - horizon_zun
- influxdb - influxdb
- ironic - ironic
- ironic_neutron_agent - ironic_neutron_agent
- ironic_prometheus_exporter - ironic_prometheus_exporter
- ironic_pxe_uefi
- iscsid - iscsid
- keepalived - keepalived
- keystone - keystone
@@ -170,11 +164,11 @@ kolla_feature_flags:
- memcached - memcached
- mistral - mistral
- multipathd - multipathd
- murano
- neutron - neutron
- neutron_agent_ha - neutron_agent_ha
- neutron_bgp_dragent - neutron_bgp_dragent
- neutron_dvr - neutron_dvr
- neutron_fwaas
- neutron_horizon_policy_file - neutron_horizon_policy_file
- neutron_infoblox_ipam_agent - neutron_infoblox_ipam_agent
- neutron_metering - neutron_metering
@@ -186,6 +180,7 @@ kolla_feature_flags:
- neutron_segments - neutron_segments
- neutron_sfc - neutron_sfc
- neutron_sriov - neutron_sriov
- neutron_taas
- neutron_trunk - neutron_trunk
- neutron_vpnaas - neutron_vpnaas
- nova - nova
@@ -203,7 +198,6 @@ kolla_feature_flags:
- openstack_core - openstack_core
- openvswitch - openvswitch
- osprofiler - osprofiler
- outward_rabbitmq
- ovn - ovn
- ovs_dpdk - ovs_dpdk
- placement - placement
@@ -229,10 +223,7 @@ kolla_feature_flags:
- proxysql - proxysql
- rabbitmq - rabbitmq
- redis - redis
- sahara
- senlin
- skyline - skyline
- solum
- swift - swift
- swift_recon - swift_recon
- swift_s3api - swift_s3api
@@ -241,7 +232,5 @@ kolla_feature_flags:
- trove - trove
- trove_singletenant - trove_singletenant
- venus - venus
- vitrage
- vitrage_prometheus_datasource
- watcher - watcher
- zun - zun

19
etc/kayobe/kolla.yml
View File

@@ -306,7 +306,7 @@
#kolla_enable_external_api_firewalld: #kolla_enable_external_api_firewalld:
#kolla_enable_external_mariadb_load_balancer: #kolla_enable_external_mariadb_load_balancer:
#kolla_enable_fluentd: #kolla_enable_fluentd:
#kolla_enable_freezer: #kolla_enable_fluentd_systemd:
#kolla_enable_glance: #kolla_enable_glance:
#kolla_enable_glance_horizon_policy_file: #kolla_enable_glance_horizon_policy_file:
#kolla_enable_glance_image_cache: #kolla_enable_glance_image_cache:
@@ -323,29 +323,23 @@
#kolla_enable_horizon_blazar: #kolla_enable_horizon_blazar:
#kolla_enable_horizon_cloudkitty: #kolla_enable_horizon_cloudkitty:
#kolla_enable_horizon_designate: #kolla_enable_horizon_designate:
#kolla_enable_horizon_freezer: #kolla_enable_horizon_fwaas:
#kolla_enable_horizon_heat: #kolla_enable_horizon_heat:
#kolla_enable_horizon_ironic: #kolla_enable_horizon_ironic:
#kolla_enable_horizon_magnum: #kolla_enable_horizon_magnum:
#kolla_enable_horizon_manila: #kolla_enable_horizon_manila:
#kolla_enable_horizon_masakari: #kolla_enable_horizon_masakari:
#kolla_enable_horizon_mistral: #kolla_enable_horizon_mistral:
#kolla_enable_horizon_murano:
#kolla_enable_horizon_neutron_vpnaas: #kolla_enable_horizon_neutron_vpnaas:
#kolla_enable_horizon_octavia: #kolla_enable_horizon_octavia:
#kolla_enable_horizon_sahara:
#kolla_enable_horizon_senlin:
#kolla_enable_horizon_solum:
#kolla_enable_horizon_tacker: #kolla_enable_horizon_tacker:
#kolla_enable_horizon_trove: #kolla_enable_horizon_trove:
#kolla_enable_horizon_vitrage:
#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_neutron_agent: #kolla_enable_ironic_neutron_agent:
#kolla_enable_ironic_prometheus_exporter: #kolla_enable_ironic_prometheus_exporter:
#kolla_enable_ironic_pxe_uefi:
#kolla_enable_iscsid: #kolla_enable_iscsid:
#kolla_enable_keepalived: #kolla_enable_keepalived:
#kolla_enable_keystone: #kolla_enable_keystone:
@@ -369,11 +363,11 @@
#kolla_enable_memcached: #kolla_enable_memcached:
#kolla_enable_mistral: #kolla_enable_mistral:
#kolla_enable_multipathd: #kolla_enable_multipathd:
#kolla_enable_murano:
#kolla_enable_neutron: #kolla_enable_neutron:
#kolla_enable_neutron_agent_ha: #kolla_enable_neutron_agent_ha:
#kolla_enable_neutron_bgp_dragent: #kolla_enable_neutron_bgp_dragent:
#kolla_enable_neutron_dvr: #kolla_enable_neutron_dvr:
#kolla_enable_neutron_fwaas:
#kolla_enable_neutron_horizon_policy_file: #kolla_enable_neutron_horizon_policy_file:
#kolla_enable_neutron_infoblox_ipam_agent: #kolla_enable_neutron_infoblox_ipam_agent:
#kolla_enable_neutron_metering: #kolla_enable_neutron_metering:
@@ -385,6 +379,7 @@
#kolla_enable_neutron_segments: #kolla_enable_neutron_segments:
#kolla_enable_neutron_sfc: #kolla_enable_neutron_sfc:
#kolla_enable_neutron_sriov: #kolla_enable_neutron_sriov:
#kolla_enable_neutron_taas:
#kolla_enable_neutron_trunk: #kolla_enable_neutron_trunk:
#kolla_enable_neutron_vpnaas: #kolla_enable_neutron_vpnaas:
#kolla_enable_nova: #kolla_enable_nova:
@@ -402,7 +397,6 @@
#kolla_enable_openstack_core: #kolla_enable_openstack_core:
#kolla_enable_openvswitch: #kolla_enable_openvswitch:
#kolla_enable_osprofiler: #kolla_enable_osprofiler:
#kolla_enable_outward_rabbitmq:
#kolla_enable_ovn: #kolla_enable_ovn:
#kolla_enable_ovs_dpdk: #kolla_enable_ovs_dpdk:
#kolla_enable_placement: #kolla_enable_placement:
@@ -428,10 +422,7 @@
#kolla_enable_proxysql: #kolla_enable_proxysql:
#kolla_enable_rabbitmq: #kolla_enable_rabbitmq:
#kolla_enable_redis: #kolla_enable_redis:
#kolla_enable_sahara:
#kolla_enable_senlin:
#kolla_enable_skyline: #kolla_enable_skyline:
#kolla_enable_solum:
#kolla_enable_swift: #kolla_enable_swift:
#kolla_enable_swift_recon: #kolla_enable_swift_recon:
#kolla_enable_swift_s3api: #kolla_enable_swift_s3api:
@@ -440,8 +431,6 @@
#kolla_enable_trove: #kolla_enable_trove:
#kolla_enable_trove_singletenant: #kolla_enable_trove_singletenant:
#kolla_enable_venus: #kolla_enable_venus:
#kolla_enable_vitrage:
#kolla_enable_vitrage_prometheus_datasource:
#kolla_enable_watcher: #kolla_enable_watcher:
#kolla_enable_zun: #kolla_enable_zun: