From 1e963a60ada175482c415ca2f6c46a5899a6939a Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Mon, 8 Jun 2020 12:40:45 +0100 Subject: [PATCH] Update feature flags The flags in etc/kayobe/kolla.yml were out of sync with ansible/roles/kolla-ansible/vars/main.yml. This commit sorts them all alphabetically and adds a script to simplify generating the list. TrivialFix Change-Id: I0e3be19eed371853d80c401d6a46770a7d6dcbc5 --- ansible/group_vars/all/kolla | 4 +- ansible/roles/kolla-ansible/vars/main.yml | 32 +++++------ etc/kayobe/kolla.yml | 68 +++++++++++++++++++++-- tools/feature-flags.py | 16 ++++++ 4 files changed, 98 insertions(+), 22 deletions(-) create mode 100755 tools/feature-flags.py diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 783894cc9..8c87c8cbd 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -351,8 +351,8 @@ kolla_ansible_create_user: true kolla_enable_aodh: "no" kolla_enable_barbican: "no" kolla_enable_blazar: "no" -kolla_enable_central_logging: "no" kolla_enable_ceilometer: "no" +kolla_enable_central_logging: "no" kolla_enable_chrony: "yes" kolla_enable_cinder: "no" kolla_enable_cloudkitty: "no" @@ -362,8 +362,8 @@ kolla_enable_elasticsearch: "{{ 'yes' if kolla_enable_central_logging | bool or kolla_enable_etcd: "no" kolla_enable_freezer: "no" kolla_enable_glance: "{{ kolla_enable_openstack_core | bool }}" -kolla_enable_grafana: "no" kolla_enable_gnocchi: "no" +kolla_enable_grafana: "no" kolla_enable_haproxy: "yes" kolla_enable_heat: "{{ kolla_enable_openstack_core | bool }}" kolla_enable_horizon: "{{ kolla_enable_openstack_core | bool }}" diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index aea6ed1b9..4a1bf1b4e 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -81,13 +81,13 @@ kolla_feature_flags: - central_logging - chrony - cinder - - cinder_backup - cinder_backend_hnas_nfs - cinder_backend_iscsi - cinder_backend_lvm - cinder_backend_nfs - - cinder_backend_zfssa_iscsi - cinder_backend_quobyte + - cinder_backend_zfssa_iscsi + - cinder_backup - cloudkitty - collectd - congress @@ -108,8 +108,8 @@ kolla_feature_flags: - horizon_cloudkitty - horizon_congress - horizon_designate - - horizon_fwaas - horizon_freezer + - horizon_fwaas - horizon_heat - horizon_ironic - horizon_karbor @@ -137,20 +137,20 @@ kolla_feature_flags: - ironic_neutron_agent - ironic_pxe_uefi - iscsid - - karbor - kafka + - karbor - keepalived - keystone - kibana - kuryr - magnum - manila - - manila_backend_generic - - manila_backend_hnas - manila_backend_cephfs_native - manila_backend_cephfs_nfs - - mariadb + - manila_backend_generic + - manila_backend_hnas - mariabackup + - mariadb - masakari - memcached - mistral @@ -159,19 +159,19 @@ kolla_feature_flags: - multipathd - murano - neutron - - neutron_vpnaas - - neutron_sriov - - neutron_dvr - - neutron_fwaas - - neutron_qos - neutron_agent_ha - neutron_bgp_dragent + - neutron_dvr + - neutron_fwaas + - neutron_infoblox_ipam_agent + - neutron_metering + - neutron_port_forwarding - neutron_provider_networks + - neutron_qos - neutron_segments - neutron_sfc - - neutron_metering - - neutron_infoblox_ipam_agent - - neutron_port_forwarding + - neutron_sriov + - neutron_vpnaas - nova - nova_serialconsole_proxy - nova_ssh @@ -180,9 +180,9 @@ kolla_feature_flags: - opendaylight - openstack_core - openvswitch + - osprofiler - outward_rabbitmq - ovs_dpdk - - osprofiler - panko - placement - prometheus diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 3aa43c301..8a342dee9 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -188,64 +188,121 @@ #kolla_enable_blazar: #kolla_enable_cadf_notifications: #kolla_enable_ceilometer: +#kolla_enable_ceilometer_ipmi: +#kolla_enable_cells: #kolla_enable_central_logging: #kolla_enable_chrony: #kolla_enable_cinder: -#kolla_enable_cinder_backend_hnas_iscsi: #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_quobyte: #kolla_enable_cinder_backend_zfssa_iscsi: +#kolla_enable_cinder_backup: #kolla_enable_cloudkitty: +#kolla_enable_collectd: #kolla_enable_congress: +#kolla_enable_cyborg: #kolla_enable_designate: +#kolla_enable_destroy_images: +#kolla_enable_elasticsearch: #kolla_enable_etcd: #kolla_enable_fluentd: #kolla_enable_freezer: +#kolla_enable_glance: #kolla_enable_gnocchi: #kolla_enable_grafana: #kolla_enable_haproxy: #kolla_enable_heat: #kolla_enable_horizon: +#kolla_enable_horizon_blazar: +#kolla_enable_horizon_cloudkitty: +#kolla_enable_horizon_congress: +#kolla_enable_horizon_designate: +#kolla_enable_horizon_freezer: +#kolla_enable_horizon_fwaas: +#kolla_enable_horizon_heat: +#kolla_enable_horizon_ironic: +#kolla_enable_horizon_karbor: +#kolla_enable_horizon_magnum: +#kolla_enable_horizon_manila: +#kolla_enable_horizon_masakari: +#kolla_enable_horizon_mistral: +#kolla_enable_horizon_murano: +#kolla_enable_horizon_neutron_vpnaas: +#kolla_enable_horizon_octavia: +#kolla_enable_horizon_qinling: +#kolla_enable_horizon_sahara: +#kolla_enable_horizon_searchlight: +#kolla_enable_horizon_senlin: +#kolla_enable_horizon_solum: +#kolla_enable_horizon_tacker: +#kolla_enable_horizon_trove: +#kolla_enable_horizon_vitrage: +#kolla_enable_horizon_watcher: +#kolla_enable_horizon_zun: +#kolla_enable_hyperv: #kolla_enable_influxdb: #kolla_enable_ironic: #kolla_enable_ironic_ipxe: +#kolla_enable_ironic_neutron_agent: #kolla_enable_ironic_pxe_uefi: #kolla_enable_iscsid: +#kolla_enable_kafka: #kolla_enable_karbor: +#kolla_enable_keepalived: #kolla_enable_keystone: +#kolla_enable_kibana: #kolla_enable_kuryr: #kolla_enable_magnum: #kolla_enable_manila: -#kolla_enable_manila_backend_generic: -#kolla_enable_manila_backend_hnas: #kolla_enable_manila_backend_cephfs_native: #kolla_enable_manila_backend_cephfs_nfs: +#kolla_enable_manila_backend_generic: +#kolla_enable_manila_backend_hnas: #kolla_enable_mariabackup: +#kolla_enable_mariadb: +#kolla_enable_masakari: +#kolla_enable_memcached: #kolla_enable_mistral: #kolla_enable_monasca: #kolla_enable_mongodb: #kolla_enable_multipathd: #kolla_enable_murano: +#kolla_enable_neutron: #kolla_enable_neutron_agent_ha: #kolla_enable_neutron_bgp_dragent: #kolla_enable_neutron_dvr: #kolla_enable_neutron_fwaas: -#kolla_enable_neutron_lbaas: +#kolla_enable_neutron_infoblox_ipam_agent: +#kolla_enable_neutron_metering: +#kolla_enable_neutron_port_forwarding: #kolla_enable_neutron_provider_networks: #kolla_enable_neutron_qos: #kolla_enable_neutron_segments: +#kolla_enable_neutron_sfc: #kolla_enable_neutron_sriov: #kolla_enable_neutron_vpnaas: +#kolla_enable_nova: #kolla_enable_nova_serialconsole_proxy: +#kolla_enable_nova_ssh: #kolla_enable_octavia: +#kolla_enable_onos: +#kolla_enable_opendaylight: #kolla_enable_openstack_core: +#kolla_enable_openvswitch: #kolla_enable_osprofiler: +#kolla_enable_outward_rabbitmq: +#kolla_enable_ovs_dpdk: #kolla_enable_panko: +#kolla_enable_placement: #kolla_enable_prometheus: #kolla_enable_qdrouterd: +#kolla_enable_qinling: +#kolla_enable_rabbitmq: #kolla_enable_rally: +#kolla_enable_redis: #kolla_enable_sahara: #kolla_enable_searchlight: #kolla_enable_senlin: @@ -253,13 +310,16 @@ #kolla_enable_solum: #kolla_enable_storm: #kolla_enable_swift: +#kolla_enable_swift_s3api: #kolla_enable_tacker: #kolla_enable_telegraf: #kolla_enable_tempest: #kolla_enable_trove: +#kolla_enable_trove_singletenant: #kolla_enable_vitrage: #kolla_enable_vmtp: #kolla_enable_watcher: +#kolla_enable_zookeeper: #kolla_enable_zun: ############################################################################### diff --git a/tools/feature-flags.py b/tools/feature-flags.py new file mode 100755 index 000000000..4887fa4a8 --- /dev/null +++ b/tools/feature-flags.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python + +# Usage: run this script and copy the output to etc/kayobe/kolla.yml + +import os +import pathlib + +import yaml + +script_dir = pathlib.Path(__file__).parent.absolute() +path = os.path.join(script_dir, "../ansible/roles/kolla-ansible/vars/main.yml") + +with open(path) as f: + vars = yaml.safe_load(f) + for key in vars["kolla_feature_flags"]: + print("#kolla_enable_%s:" % key)