Sync enable flags in globals.yml

Change-Id: I593b06c447d156c7a981d1c617f4f9baa82884de
Closes-Bug: #1841175

ansible/group_vars/all.yml

@@ -554,6 +554,7 @@ enable_cinder_backend_nfs: "no"
 enable_cinder_backend_zfssa_iscsi: "no"
 enable_cinder_backend_quobyte: "no"
 enable_cloudkitty: "no"
+enable_collectd: "no"
 enable_congress: "no"
 enable_cyborg: "no"
 enable_designate: "no"
@@ -635,6 +636,7 @@ enable_ovs_dpdk: "no"
 enable_osprofiler: "no"
 enable_panko: "no"
 enable_placement: "{{ enable_nova }}"
+enable_prometheus: "no"
 enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
 enable_qinling: "no"
 enable_rally: "no"
@@ -671,10 +673,6 @@ murano_keystone_user: "murano"
 enable_nova_fake: "no"
 num_nova_fake_per_node: 5
 
-# Monitoring options are specified here
-enable_collectd: "no"
-enable_prometheus: "no"
-
 # Clean images options are specified here
 enable_destroy_images: "no"
 

etc/kolla/globals.yml

@@ -187,6 +187,10 @@
 # Valid options are [ none, novnc, spice, rdp ]
 #nova_console: "novnc"
 
+# Enable core OpenStack services. This includes:
+# glance, keystone, neutron, nova, heat, and horizon.
+#enable_openstack_core: "yes"
+
 # These roles are required for Kolla to be operation, however a savvy deployer
 # could disable some of these required roles and run their own services.
 #enable_glance: "{{ enable_openstack_core | bool }}"
@@ -204,6 +208,8 @@
 #enable_aodh: "no"
 #enable_barbican: "no"
 #enable_blazar: "no"
+# NOTE: This variable has been deprecated and will be removed in the U cycle.
+#enable_cadf_notifications: "no"
 #enable_ceilometer: "no"
 #enable_ceilometer_ipmi: "no"
 #enable_central_logging: "no"
@@ -216,9 +222,10 @@
 #enable_cinder: "no"
 #enable_cinder_backup: "yes"
 #enable_cinder_backend_hnas_nfs: "no"
-#enable_cinder_backend_iscsi: "no"
+#enable_cinder_backend_iscsi: "{{ enable_cinder_backend_lvm | bool or enable_cinder_backend_zfssa_iscsi | bool }}"
 #enable_cinder_backend_lvm: "no"
 #enable_cinder_backend_nfs: "no"
+#enable_cinder_backend_zfssa_iscsi: "no"
 #enable_cinder_backend_quobyte: "no"
 #enable_cloudkitty: "no"
 #enable_collectd: "no"
@@ -226,7 +233,7 @@
 #enable_cyborg: "no"
 #enable_designate: "no"
 #enable_destroy_images: "no"
-#enable_elasticsearch: "{{ 'yes' if enable_central_logging | bool or enable_freezer | bool or enable_osprofiler | bool or enable_skydive | bool or enable_monasca | bool else 'no' }}"
+#enable_elasticsearch: "{{ 'yes' if enable_central_logging | bool or enable_osprofiler | bool or enable_skydive | bool or enable_monasca | bool else 'no' }}"
 #enable_etcd: "no"
 #enable_fluentd: "yes"
 #enable_freezer: "no"
@@ -238,8 +245,9 @@
 #enable_horizon_cloudkitty: "{{ enable_cloudkitty | bool }}"
 #enable_horizon_congress: "{{ enable_congress | bool }}"
 #enable_horizon_designate: "{{ enable_designate | bool }}"
-#enable_horizon_freezer: "{{ enable_freezer | bool }}"
 #enable_horizon_fwaas: "{{ enable_neutron_fwaas | bool }}"
+#enable_horizon_freezer: "{{ enable_freezer | bool }}"
+#enable_horizon_heat: "{{ enable_heat | bool }}"
 #enable_horizon_ironic: "{{ enable_ironic | bool }}"
 #enable_horizon_karbor: "{{ enable_karbor | bool }}"
 #enable_horizon_magnum: "{{ enable_magnum | bool }}"
@@ -256,16 +264,19 @@
 #enable_horizon_solum: "{{ enable_solum | bool }}"
 #enable_horizon_tacker: "{{ enable_tacker | bool }}"
 #enable_horizon_trove: "{{ enable_trove | bool }}"
+#enable_horizon_vitrage: "{{ enable_vitrage | bool }}"
 #enable_horizon_watcher: "{{ enable_watcher | bool }}"
 #enable_horizon_zun: "{{ enable_zun | bool }}"
 #enable_hyperv: "no"
-#enable_influxdb: "no"
+#enable_influxdb: "{{ enable_monasca | bool or (cloudkitty_storage_backend is defined and cloudkitty_storage_backend == 'influxdb') }}"
 #enable_ironic: "no"
 #enable_ironic_ipxe: "no"
-#enable_ironic_neutron_agent: "no"
+#enable_ironic_neutron_agent: "{{ enable_neutron | bool and enable_ironic | bool }}"
 #enable_ironic_pxe_uefi: "no"
-#enable_kafka: "no"
+#enable_iscsid: "{{ (enable_cinder | bool and enable_cinder_backend_iscsi | bool) or enable_ironic | bool }}"
 #enable_karbor: "no"
+#enable_kafka: "{{ enable_monasca | bool }}"
+#enable_kibana: "{{ 'yes' if enable_central_logging | bool or enable_monasca | bool else 'no' }}"
 #enable_kuryr: "no"
 #enable_magnum: "no"
 #enable_manila: "no"
@@ -277,31 +288,33 @@
 #enable_mistral: "no"
 #enable_monasca: "no"
 #enable_mongodb: "no"
-#enable_murano: "no"
 #enable_multipathd: "no"
-#enable_neutron_bgp_dragent: "no"
+#enable_murano: "no"
+#enable_neutron_vpnaas: "no"
+#enable_neutron_sriov: "no"
 #enable_neutron_dvr: "no"
 #enable_neutron_fwaas: "no"
 #enable_neutron_qos: "no"
 #enable_neutron_agent_ha: "no"
-#enable_neutron_vpnaas: "no"
-#enable_neutron_sriov: "no"
+#enable_neutron_bgp_dragent: "no"
+#enable_neutron_provider_networks: "no"
+#enable_neutron_segments: "no"
 #enable_neutron_sfc: "no"
 #enable_neutron_metering: "no"
-#enable_nova_fake: "no"
+#enable_neutron_infoblox_ipam_agent: "no"
+#enable_neutron_port_forwarding: "no"
 #enable_nova_serialconsole_proxy: "no"
 #enable_nova_ssh: "yes"
 #enable_octavia: "no"
 #enable_onos: "no"
 #enable_opendaylight: "no"
-#enable_openstack_core: "yes"
 #enable_openvswitch: "{{ enable_neutron | bool and neutron_plugin_agent != 'linuxbridge' }}"
 #enable_ovs_dpdk: "no"
 #enable_osprofiler: "no"
 #enable_panko: "no"
 #enable_placement: "{{ enable_nova }}"
 #enable_prometheus: "no"
-#enable_qdrouterd: "no"
+#enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
 #enable_qinling: "no"
 #enable_rally: "no"
 #enable_redis: "no"
@@ -310,10 +323,11 @@
 #enable_senlin: "no"
 #enable_skydive: "no"
 #enable_solum: "no"
+#enable_storm: "{{ enable_monasca | bool }}"
 #enable_swift: "no"
-#enable_storm: "no"
-#enable_telegraf: "no"
+#enable_swift_s3api: "no"
 #enable_tacker: "no"
+#enable_telegraf: "no"
 #enable_tempest: "no"
 #enable_trove: "no"
 #enable_trove_singletenant: "no"
@@ -321,7 +335,7 @@
 #enable_vmtp: "no"
 #enable_watcher: "no"
 #enable_xtrabackup: "no"
-#enable_zookeeper: "no"
+#enable_zookeeper: "{{ enable_kafka | bool }}"
 #enable_zun: "no"
 
 ##############