From f3ab02280d20048a5c74346883ec2db076502435 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Wed, 7 Dec 2022 13:08:11 +0100
Subject: [PATCH] [release] Sync Kolla Ansible inventory for Zed

Syncs with Kolla Ansible inventory for Zed release, at commit
ce28cbc0d8bd907982212f4963b3a3e48215f688.

Change-Id: If7171c925be052e59e64423d62c9416485ca9113
---
 .../templates/overcloud-components.j2         |  9 ---------
 .../templates/overcloud-services.j2           | 19 +++++++++++++------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index c879fba4f..693d186d5 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -43,9 +43,6 @@ monitoring
 [kafka:children]
 control
 
-[kibana:children]
-control
-
 [telegraf:children]
 compute
 control
@@ -53,9 +50,6 @@ monitoring
 network
 storage
 
-[elasticsearch:children]
-control
-
 [hacluster:children]
 control
 
@@ -74,9 +68,6 @@ control
 [outward-rabbitmq:children]
 control
 
-[qdrouterd:children]
-control
-
 [monasca-agent:children]
 compute
 control
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
index 43183cf7e..f26ab1f58 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -24,9 +24,16 @@ common
 [kolla-toolbox:children]
 common
 
-# Elasticsearch Curator
+[opensearch:children]
+control
+
+# TODO: This is used for cleanup and can be removed in the Antelope cycle.
 [elasticsearch-curator:children]
-elasticsearch
+opensearch
+
+# Opensearch dashboards
+[opensearch-dashboards:children]
+opensearch
 
 # Glance
 [glance-api:children]
@@ -508,14 +515,11 @@ storage
 [prometheus-alertmanager:children]
 monitoring
 
-[prometheus-msteams:children]
-monitoring
-
 [prometheus-openstack-exporter:children]
 monitoring
 
 [prometheus-elasticsearch-exporter:children]
-elasticsearch
+opensearch
 
 [prometheus-blackbox-exporter:children]
 monitoring
@@ -523,6 +527,9 @@ monitoring
 [prometheus-libvirt-exporter:children]
 compute
 
+[prometheus-msteams:children]
+prometheus-alertmanager
+
 [masakari-api:children]
 control