diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 index 4cd6c8792..c0487a462 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 @@ -66,19 +66,15 @@ storage [elasticsearch:children] control +[hacluster:children] +control + +[hacluster-remote:children] +compute + [haproxy:children] network -[hyperv] -#hyperv_host - -[hyperv:vars] -#ansible_user=user -#ansible_password=password -#ansible_port=5986 -#ansible_connection=winrm -#ansible_winrm_server_cert_validation=ignore - [mariadb:children] control diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 index 3a5220a18..fa3f78d80 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2 @@ -401,6 +401,9 @@ senlin [octavia-api:children] octavia +[octavia-driver-agent:children] +octavia + [octavia-health-manager:children] octavia @@ -529,7 +532,10 @@ control [masakari-engine:children] control -[masakari-monitors:children] +[masakari-hostmonitor:children] +control + +[masakari-instancemonitor:children] compute [ovn-controller:children] diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index 6e6587599..08874b81b 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -74,8 +74,8 @@ kolla_feature_flags: - aodh - barbican - blazar - - cadf_notifications - ceilometer + - ceilometer_horizon_policy_file - ceilometer_ipmi - cells - central_logging @@ -88,20 +88,30 @@ kolla_feature_flags: - cinder_backend_quobyte - cinder_backend_zfssa_iscsi - cinder_backup + - cinder_horizon_policy_file - cloudkitty - collectd + - container_healthchecks - cyborg - designate - destroy_images - elasticsearch + - elasticsearch_curator - etcd + - external_mariadb_load_balancer - fluentd - freezer - glance + - glance_horizon_policy_file + - glance_image_cache - gnocchi + - gnocchi_statsd - grafana + - hacluster - haproxy + - haproxy_memcached - heat + - heat_horizon_policy_file - horizon - horizon_blazar - horizon_cloudkitty @@ -113,6 +123,7 @@ kolla_feature_flags: - horizon_manila - horizon_masakari - horizon_mistral + - horizon_monasca - horizon_murano - horizon_neutron_vpnaas - horizon_octavia @@ -124,7 +135,6 @@ kolla_feature_flags: - horizon_vitrage - horizon_watcher - horizon_zun - - hyperv - influxdb - ironic - ironic_ipxe @@ -134,6 +144,8 @@ kolla_feature_flags: - kafka - keepalived - keystone + - keystone_federation + - keystone_horizon_policy_file - kibana - kuryr - magnum @@ -141,6 +153,7 @@ kolla_feature_flags: - manila_backend_cephfs_native - manila_backend_cephfs_nfs - manila_backend_generic + - manila_backend_glusterfs_nfs - manila_backend_hnas - mariabackup - mariadb @@ -154,6 +167,7 @@ kolla_feature_flags: - neutron_agent_ha - neutron_bgp_dragent - neutron_dvr + - neutron_horizon_policy_file - neutron_infoblox_ipam_agent - neutron_metering - neutron_mlnx @@ -163,20 +177,36 @@ kolla_feature_flags: - neutron_segments - neutron_sfc - neutron_sriov + - neutron_trunk - neutron_vpnaas - nova + - nova_fake + - nova_horizon_policy_file - nova_serialconsole_proxy - nova_ssh - octavia - - onos + - octavia_driver_agent - openstack_core - openvswitch - osprofiler - outward_rabbitmq + - ovn - ovs_dpdk - panko - placement - prometheus + - prometheus_alertmanager + - prometheus_blackbox_exporter + - prometheus_cadvisor + - prometheus_ceph_mgr_exporter + - prometheus_elasticsearch_exporter + - prometheus_haproxy_exporter + - prometheus_memcached_exporter + - prometheus_mysqld_exporter + - prometheus_node_exporter + - prometheus_openstack_exporter + - prometheus_rabbitmq_exporter + - prometheus_server - qdrouterd - rabbitmq - rally @@ -187,6 +217,7 @@ kolla_feature_flags: - solum - storm - swift + - swift_recon - swift_s3api - tacker - telegraf @@ -194,6 +225,7 @@ kolla_feature_flags: - trove - trove_singletenant - vitrage + - vitrage_prometheus_datasource - vmtp - watcher - zookeeper diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 74f805fad..fa5c4cb40 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -208,8 +208,8 @@ #kolla_enable_aodh: #kolla_enable_barbican: #kolla_enable_blazar: -#kolla_enable_cadf_notifications: #kolla_enable_ceilometer: +#kolla_enable_ceilometer_horizon_policy_file: #kolla_enable_ceilometer_ipmi: #kolla_enable_cells: #kolla_enable_central_logging: @@ -222,24 +222,33 @@ #kolla_enable_cinder_backend_quobyte: #kolla_enable_cinder_backend_zfssa_iscsi: #kolla_enable_cinder_backup: +#kolla_enable_cinder_horizon_policy_file: #kolla_enable_cloudkitty: #kolla_enable_collectd: +#kolla_enable_container_healthchecks: #kolla_enable_cyborg: #kolla_enable_designate: #kolla_enable_destroy_images: #kolla_enable_elasticsearch: +#kolla_enable_elasticsearch_curator: #kolla_enable_etcd: +#kolla_enable_external_mariadb_load_balancer: #kolla_enable_fluentd: #kolla_enable_freezer: #kolla_enable_glance: +#kolla_enable_glance_horizon_policy_file: +#kolla_enable_glance_image_cache: #kolla_enable_gnocchi: +#kolla_enable_gnocchi_statsd: #kolla_enable_grafana: +#kolla_enable_hacluster: #kolla_enable_haproxy: +#kolla_enable_haproxy_memcached: #kolla_enable_heat: +#kolla_enable_heat_horizon_policy_file: #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_heat: @@ -248,6 +257,7 @@ #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: @@ -259,7 +269,6 @@ #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: @@ -269,6 +278,8 @@ #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_magnum: @@ -276,6 +287,7 @@ #kolla_enable_manila_backend_cephfs_native: #kolla_enable_manila_backend_cephfs_nfs: #kolla_enable_manila_backend_generic: +#kolla_enable_manila_backend_glusterfs_nfs: #kolla_enable_manila_backend_hnas: #kolla_enable_mariabackup: #kolla_enable_mariadb: @@ -289,6 +301,7 @@ #kolla_enable_neutron_agent_ha: #kolla_enable_neutron_bgp_dragent: #kolla_enable_neutron_dvr: +#kolla_enable_neutron_horizon_policy_file: #kolla_enable_neutron_infoblox_ipam_agent: #kolla_enable_neutron_metering: #kolla_enable_neutron_mlnx: @@ -298,20 +311,36 @@ #kolla_enable_neutron_segments: #kolla_enable_neutron_sfc: #kolla_enable_neutron_sriov: +#kolla_enable_neutron_trunk: #kolla_enable_neutron_vpnaas: #kolla_enable_nova: +#kolla_enable_nova_fake: +#kolla_enable_nova_horizon_policy_file: #kolla_enable_nova_serialconsole_proxy: #kolla_enable_nova_ssh: #kolla_enable_octavia: -#kolla_enable_onos: +#kolla_enable_octavia_driver_agent: #kolla_enable_openstack_core: #kolla_enable_openvswitch: #kolla_enable_osprofiler: #kolla_enable_outward_rabbitmq: +#kolla_enable_ovn: #kolla_enable_ovs_dpdk: #kolla_enable_panko: #kolla_enable_placement: #kolla_enable_prometheus: +#kolla_enable_prometheus_alertmanager: +#kolla_enable_prometheus_blackbox_exporter: +#kolla_enable_prometheus_cadvisor: +#kolla_enable_prometheus_ceph_mgr_exporter: +#kolla_enable_prometheus_elasticsearch_exporter: +#kolla_enable_prometheus_haproxy_exporter: +#kolla_enable_prometheus_memcached_exporter: +#kolla_enable_prometheus_mysqld_exporter: +#kolla_enable_prometheus_node_exporter: +#kolla_enable_prometheus_openstack_exporter: +#kolla_enable_prometheus_rabbitmq_exporter: +#kolla_enable_prometheus_server: #kolla_enable_qdrouterd: #kolla_enable_rabbitmq: #kolla_enable_rally: @@ -322,6 +351,7 @@ #kolla_enable_solum: #kolla_enable_storm: #kolla_enable_swift: +#kolla_enable_swift_recon: #kolla_enable_swift_s3api: #kolla_enable_tacker: #kolla_enable_telegraf: @@ -329,6 +359,7 @@ #kolla_enable_trove: #kolla_enable_trove_singletenant: #kolla_enable_vitrage: +#kolla_enable_vitrage_prometheus_datasource: #kolla_enable_vmtp: #kolla_enable_watcher: #kolla_enable_zookeeper: