From 61e11038c58f29a56441418594148c54d0967d0f Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 19 Apr 2024 07:32:45 +0000
Subject: [PATCH] Revert "Deprecate Masakari"

This reverts commit 9675347fecd2907e7f60e84e405abcedf426b229.

Reason for revert: Masakari CI is working

Change-Id: Ifb44a437b96c0c029210b1491ee6c6403ee9e6fb
(cherry picked from commit c3b566218128c3819b127c3b3b66b57cd1bdde83)
---
 README.rst                                                  | 2 +-
 doc/source/reference/compute/masakari-guide.rst             | 5 -----
 .../notes/dedeprecate-masakari-52e3979f563db779.yaml        | 6 ++++++
 3 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/dedeprecate-masakari-52e3979f563db779.yaml

diff --git a/README.rst b/README.rst
index 43fd247b62..b7859c8f66 100644
--- a/README.rst
+++ b/README.rst
@@ -57,7 +57,7 @@ Kolla Ansible deploys containers for the following OpenStack projects:
 - `Kuryr <https://docs.openstack.org/kuryr/latest/>`__
 - `Magnum <https://docs.openstack.org/magnum/latest/>`__
 - `Manila <https://docs.openstack.org/manila/latest/>`__
-- `Masakari <https://docs.openstack.org/masakari/latest/>`__ (deprecated)
+- `Masakari <https://docs.openstack.org/masakari/latest/>`__
 - `Mistral <https://docs.openstack.org/mistral/latest/>`__
 - `Murano <https://docs.openstack.org/murano/latest/>`__
 - `Neutron <https://docs.openstack.org/neutron/latest/>`__
diff --git a/doc/source/reference/compute/masakari-guide.rst b/doc/source/reference/compute/masakari-guide.rst
index 429e1a9c86..51dd4fd64b 100644
--- a/doc/source/reference/compute/masakari-guide.rst
+++ b/doc/source/reference/compute/masakari-guide.rst
@@ -19,8 +19,3 @@ which are the main Masakari components only if ``enable_masakari`` is set in
 Masakari Instance Monitor containers are enabled. The deployment of each type
 of monitors can be controlled individually via
 ``enable_masakari_instancemonitor`` and ``enable_masakari_hostmonitor``.
-
-.. note::
-   Support for deploying Masakari has been deprecated in the 2023.2 (Bobcat)
-   release due to failures in the CI and lack of contributors working on
-   fixing this.
diff --git a/releasenotes/notes/dedeprecate-masakari-52e3979f563db779.yaml b/releasenotes/notes/dedeprecate-masakari-52e3979f563db779.yaml
new file mode 100644
index 0000000000..b87a3c1d75
--- /dev/null
+++ b/releasenotes/notes/dedeprecate-masakari-52e3979f563db779.yaml
@@ -0,0 +1,6 @@
+---
+deprecations:
+  - |
+    Support for deploying Masakari is no longer deprecated. The Masakari CI
+    scenarios are now working again, and commitment has been made to improve
+    the health of the project.