Merge "Revert "Deprecate Masakari""

README.rst

@@ -56,7 +56,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/>`__

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.

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.