From beb6ec7903bff734c4a55a47379630a07c57d1e3 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 15 Nov 2023 18:53:41 +0100
Subject: [PATCH] Remove Monasca and co remnants

Change-Id: I2577245440d510ab19f48915479a8e3575b996b7
---
 ansible/inventory/group_vars/all/grafana      |  3 +-
 .../templates/overcloud-components.j2         | 19 ----------
 .../templates/overcloud-services.j2           | 35 -------------------
 etc/kayobe/grafana.yml                        |  3 +-
 4 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/ansible/inventory/group_vars/all/grafana b/ansible/inventory/group_vars/all/grafana
index 6e92d087..9a2e73b5 100644
--- a/ansible/inventory/group_vars/all/grafana
+++ b/ansible/inventory/group_vars/all/grafana
@@ -2,8 +2,7 @@
 ###############################################################################
 # Grafana configuration.
 
-# Grafana local admin user name. If you are deploying Monasca Grafana this
-# should not conflict with an OpenStack user name.
+# Grafana local admin user name.
 grafana_local_admin_user_name: "grafana_local_admin"
 
 ###############################################################################
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index 41b5db0c..9fca0ed7 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -40,9 +40,6 @@ monitoring
 [prometheus:children]
 monitoring
 
-[kafka:children]
-control
-
 [telegraf:children]
 compute
 control
@@ -68,19 +65,6 @@ control
 [outward-rabbitmq:children]
 control
 
-[monasca-agent:children]
-compute
-control
-monitoring
-network
-storage
-
-[monasca:children]
-monitoring
-
-[storm:children]
-monitoring
-
 [keystone:children]
 control
 
@@ -183,9 +167,6 @@ control
 [bifrost:children]
 deployment
 
-[zookeeper:children]
-control
-
 [zun:children]
 control
 
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
index 19b9f582..bef54bb0 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -206,41 +206,6 @@ murano
 [murano-engine:children]
 murano
 
-# Monasca
-[monasca-agent-collector:children]
-monasca-agent
-
-[monasca-agent-forwarder:children]
-monasca-agent
-
-[monasca-agent-statsd:children]
-monasca-agent
-
-[monasca-api:children]
-monasca
-
-[monasca-log-persister:children]
-monasca
-
-[monasca-log-metrics:children]
-monasca
-
-[monasca-thresh:children]
-monasca
-
-[monasca-notification:children]
-monasca
-
-[monasca-persister:children]
-monasca
-
-# Storm
-[storm-worker:children]
-storm
-
-[storm-nimbus:children]
-storm
-
 # Ironic
 [ironic-api:children]
 ironic
diff --git a/etc/kayobe/grafana.yml b/etc/kayobe/grafana.yml
index d67a972e..66d19c7a 100644
--- a/etc/kayobe/grafana.yml
+++ b/etc/kayobe/grafana.yml
@@ -2,8 +2,7 @@
 ###############################################################################
 # Grafana configuration.
 
-# Grafana local admin user name. If you are deploying Monasca Grafana this
-# should not conflict with an OpenStack user name.
+# Grafana local admin user name.
 #grafana_local_admin_user_name:
 
 ###############################################################################
-- 
GitLab