From 3d0e1a3818016bf74ef6a12ba31f16bf4c30cd93 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 7 Dec 2022 22:38:41 +0100 Subject: [PATCH] [release] Sync Kolla Ansible feature flags for Zed Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/866884 Change-Id: Ie3ea200b2bbe07271942a06fa1887561a9c04fda --- ansible/roles/kolla-ansible/vars/main.yml | 23 ++++++++++++++--------- etc/kayobe/kolla.yml | 23 ++++++++++++++--------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index 30a76b5c0..94b95b3c5 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -87,6 +87,9 @@ kolla_feature_flags: - cinder_backend_iscsi - cinder_backend_lvm - cinder_backend_nfs + - cinder_backend_pure_fc + - cinder_backend_pure_iscsi + - cinder_backend_pure_roce - cinder_backend_quobyte - cinder_backup - cinder_horizon_policy_file @@ -96,9 +99,8 @@ kolla_feature_flags: - cyborg - designate - destroy_images - - elasticsearch - - elasticsearch_curator - etcd + - external_api_firewalld - external_mariadb_load_balancer - fluentd - freezer @@ -108,6 +110,7 @@ kolla_feature_flags: - gnocchi - gnocchi_statsd - grafana + - grafana_external - hacluster - haproxy - haproxy_memcached @@ -124,7 +127,6 @@ kolla_feature_flags: - horizon_manila - horizon_masakari - horizon_mistral - - horizon_monasca - horizon_murano - horizon_neutron_vpnaas - horizon_octavia @@ -141,12 +143,10 @@ kolla_feature_flags: - ironic_neutron_agent - ironic_pxe_uefi - iscsid - - kafka - keepalived - keystone - keystone_federation - keystone_horizon_policy_file - - kibana - kuryr - loadbalancer - magnum @@ -159,9 +159,10 @@ kolla_feature_flags: - mariabackup - mariadb - masakari + - masakari_hostmonitor + - masakari_instancemonitor - memcached - mistral - - monasca - multipathd - murano - neutron @@ -189,6 +190,9 @@ kolla_feature_flags: - nova_ssh - octavia - octavia_driver_agent + - opensearch + - opensearch_dashboards + - opensearch_dashboards_external - openstack_core - openvswitch - osprofiler @@ -198,6 +202,7 @@ kolla_feature_flags: - placement - prometheus - prometheus_alertmanager + - prometheus_alertmanager_external - prometheus_blackbox_exporter - prometheus_cadvisor - prometheus_ceph_mgr_exporter @@ -207,19 +212,20 @@ 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_rabbitmq_exporter - prometheus_server - - qdrouterd + - proxysql - rabbitmq - redis - sahara - senlin - skydive - solum - - storm - swift - swift_recon - swift_s3api @@ -231,5 +237,4 @@ kolla_feature_flags: - vitrage - vitrage_prometheus_datasource - watcher - - zookeeper - zun diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index a1e54ad7c..4596969a0 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -282,6 +282,9 @@ #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_roce: #kolla_enable_cinder_backend_quobyte: #kolla_enable_cinder_backup: #kolla_enable_cinder_horizon_policy_file: @@ -291,9 +294,8 @@ #kolla_enable_cyborg: #kolla_enable_designate: #kolla_enable_destroy_images: -#kolla_enable_elasticsearch: -#kolla_enable_elasticsearch_curator: #kolla_enable_etcd: +#kolla_enable_external_api_firewalld: #kolla_enable_external_mariadb_load_balancer: #kolla_enable_fluentd: #kolla_enable_freezer: @@ -303,6 +305,7 @@ #kolla_enable_gnocchi: #kolla_enable_gnocchi_statsd: #kolla_enable_grafana: +#kolla_enable_grafana_external: #kolla_enable_hacluster: #kolla_enable_haproxy: #kolla_enable_haproxy_memcached: @@ -319,7 +322,6 @@ #kolla_enable_horizon_manila: #kolla_enable_horizon_masakari: #kolla_enable_horizon_mistral: -#kolla_enable_horizon_monasca: #kolla_enable_horizon_murano: #kolla_enable_horizon_neutron_vpnaas: #kolla_enable_horizon_octavia: @@ -336,12 +338,10 @@ #kolla_enable_ironic_neutron_agent: #kolla_enable_ironic_pxe_uefi: #kolla_enable_iscsid: -#kolla_enable_kafka: #kolla_enable_keepalived: #kolla_enable_keystone: #kolla_enable_keystone_federation: #kolla_enable_keystone_horizon_policy_file: -#kolla_enable_kibana: #kolla_enable_kuryr: #kolla_enable_loadbalancer: #kolla_enable_magnum: @@ -354,9 +354,10 @@ #kolla_enable_mariabackup: #kolla_enable_mariadb: #kolla_enable_masakari: +#kolla_enable_masakari_hostmonitor: +#kolla_enable_masakari_instancemonitor: #kolla_enable_memcached: #kolla_enable_mistral: -#kolla_enable_monasca: #kolla_enable_multipathd: #kolla_enable_murano: #kolla_enable_neutron: @@ -384,6 +385,9 @@ #kolla_enable_nova_ssh: #kolla_enable_octavia: #kolla_enable_octavia_driver_agent: +#kolla_enable_opensearch: +#kolla_enable_opensearch_dashboards: +#kolla_enable_opensearch_dashboards_external: #kolla_enable_openstack_core: #kolla_enable_openvswitch: #kolla_enable_osprofiler: @@ -393,6 +397,7 @@ #kolla_enable_placement: #kolla_enable_prometheus: #kolla_enable_prometheus_alertmanager: +#kolla_enable_prometheus_alertmanager_external: #kolla_enable_prometheus_blackbox_exporter: #kolla_enable_prometheus_cadvisor: #kolla_enable_prometheus_ceph_mgr_exporter: @@ -402,19 +407,20 @@ #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_rabbitmq_exporter: #kolla_enable_prometheus_server: -#kolla_enable_qdrouterd: +#kolla_enable_proxysql: #kolla_enable_rabbitmq: #kolla_enable_redis: #kolla_enable_sahara: #kolla_enable_senlin: #kolla_enable_skydive: #kolla_enable_solum: -#kolla_enable_storm: #kolla_enable_swift: #kolla_enable_swift_recon: #kolla_enable_swift_s3api: @@ -426,7 +432,6 @@ #kolla_enable_vitrage: #kolla_enable_vitrage_prometheus_datasource: #kolla_enable_watcher: -#kolla_enable_zookeeper: #kolla_enable_zun: ###############################################################################