From 0bdc01d64083892df9d0c56251872364de6ce4b5 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 19 Apr 2024 08:56:40 +0100
Subject: [PATCH] Revert Deprecation of Masakari

This partially reverts commit fe1a74da98fc99928a87c30e250a86f164f52d03
for Masakari only.

Reason for revert: Masakari CI is working

Change-Id: I486b261acefb90f9e442c7d1746a98bebf2f2aca
(cherry picked from commit f7c84c21c00ad9a41e630ebe8b31b74340caba18)
---
 README.rst                                                  | 2 +-
 .../notes/dedeprecate-masakari-362eb4b01d558e9d.yaml        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/dedeprecate-masakari-362eb4b01d558e9d.yaml

diff --git a/README.rst b/README.rst
index 2859e123b0..9a248b5e4f 100644
--- a/README.rst
+++ b/README.rst
@@ -86,7 +86,7 @@ Kolla provides images to deploy 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/>`__
 - `Monasca <https://docs.openstack.org/monasca-api/latest/>`__
 - `Murano <https://docs.openstack.org/murano/latest/>`__
diff --git a/releasenotes/notes/dedeprecate-masakari-362eb4b01d558e9d.yaml b/releasenotes/notes/dedeprecate-masakari-362eb4b01d558e9d.yaml
new file mode 100644
index 0000000000..40bc05d298
--- /dev/null
+++ b/releasenotes/notes/dedeprecate-masakari-362eb4b01d558e9d.yaml
@@ -0,0 +1,6 @@
+---
+deprecations:
+  - |
+    Support for building Masakari images is no longer deprecated. The Masakari
+    CI scenarios are now working again, and commitment has been made to improve
+    the health of the project.