From 52a53927f5d390886c3940e364fe9fa888e3bc98 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Mon, 5 Dec 2022 15:10:50 +0100
Subject: Remove monasca, kafka, storm and zookeeper.

Monasca, kafka, storm and zookeeper have been removed in kolla-ansible [1],[2].

[1]: https://review.opendev.org/c/openstack/kolla-ansible/+/861392
[2]: https://review.opendev.org/c/openstack/kolla-ansible/+/865029

Change-Id: I0958a9353bc4585c4f65a1d316328a0e80b0b8b7
---
 kolla/common/config.py     |  1 -
 kolla/common/sources.py    | 33 ---------------------------------
 kolla/common/users.py      |  6 +++---
 kolla/image/unbuildable.py |  2 --
 4 files changed, 3 insertions(+), 39 deletions(-)

(limited to 'kolla')

diff --git a/kolla/common/config.py b/kolla/common/config.py
index 88c56e634..67efda522 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -105,7 +105,6 @@ _PROFILE_OPTS = [
                     'manila',
                     'masakari',
                     'mistral',
-                    'monasca',
                     'murano',
                     'octavia',
                     'redis',
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
index cfc428da9..c65f6eaae 100644
--- a/kolla/common/sources.py
+++ b/kolla/common/sources.py
@@ -116,10 +116,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/mistral-dashboard/'
                      'mistral-dashboard-${openstack_branch}.tar.gz')},
-    'horizon-plugin-monasca-ui': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-ui/'
-                     'monasca-ui-${openstack_branch}.tar.gz')},
     'horizon-plugin-murano-dashboard': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/murano-dashboard/'
@@ -208,35 +204,6 @@ SOURCES = {
         'type': 'url',
         'location': ('$tarballs_base/openstack/tacker/'
                      'tacker-${openstack_branch}.tar.gz')},
-    'monasca-agent': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-agent/'
-                     'monasca-agent-${openstack_branch}.tar.gz')},
-    'monasca-api': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-api/'
-                     'monasca-api-${openstack_branch}.tar.gz')},
-    'monasca-notification': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-notification/'
-                     'monasca-notification-${openstack_branch}.tar.gz')},
-    'monasca-persister': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-persister/'
-                     'monasca-persister-${openstack_branch}.tar.gz')},
-    'monasca-statsd': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-statsd/'
-                     'monasca-statsd-${openstack_branch}.tar.gz')},
-    # FIXME(dszumski): Use openstack tar when infra is fixed
-    'monasca-thresh': {
-        'type': 'url',
-        'location': ('https://github.com/openstack/monasca-thresh/archive/'
-                     '${openstack_branch_slashed}.tar.gz')},
-    'monasca-thresh-additions-monasca-common': {
-        'type': 'url',
-        'location': ('$tarballs_base/openstack/monasca-common/'
-                     'monasca-common-${openstack_branch}.tar.gz')},
     'murano-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/murano/'
diff --git a/kolla/common/users.py b/kolla/common/users.py
index 4d8aefa17..f001da24b 100644
--- a/kolla/common/users.py
+++ b/kolla/common/users.py
@@ -97,7 +97,7 @@ USERS = {
         'uid': 42422,
         'gid': 42422,
     },
-    'kafka-user': {
+    'kafka-user': {  # unused user (kafka dropped)
         'uid': 42423,
         'gid': 42423,
     },
@@ -125,7 +125,7 @@ USERS = {
         'uid': 42430,
         'gid': 42430,
     },
-    'monasca-user': {
+    'monasca-user': {  # unused user (monasca dropped)
         'uid': 42431,
         'gid': 42431,
     },
@@ -201,7 +201,7 @@ USERS = {
         'uid': 42451,
         'gid': 42451,
     },
-    'zookeeper-user': {
+    'zookeeper-user': {  # unused user (zookeeper dropped)
         'uid': 42453,
         'gid': 42453,
     },
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py
index aabdfbfe4..092b5cc33 100644
--- a/kolla/image/unbuildable.py
+++ b/kolla/image/unbuildable.py
@@ -17,8 +17,6 @@
 UNBUILDABLE_IMAGES = {
     'aarch64': {
         "bifrost-base",      # someone need to get upstream working first
-        "monasca-base",      # 'confluent-kafka' requires newer libfdkafka-dev
-                             # than distributions have (v1.9.0+ in Zed)
         "prometheus-msteams",  # no aarch64 binary
         "prometheus-mtail",  # no aarch64 binary
         "skydive-base",      # no aarch64 binary
-- 
cgit v1.2.3