From d936e1a7b6f2625e1f42ee8d3e05435c98f5a082 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@osism.tech>
Date: Tue, 7 May 2024 21:27:41 +0200
Subject: [PATCH] Prepare 7.0.4 release (#1364)

Signed-off-by: Christian Berendt <berendt@osism.tech>
---
 doc/source/index.rst   |  2 +-
 doc/source/notes/7.rst | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 51044730..0f812080 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -2,7 +2,7 @@
 OSISM releases
 ==============
 
-The latest available stable release is 7.0.3.
+The latest available stable release is 7.0.4.
 
 Release notes
 =============
diff --git a/doc/source/notes/7.rst b/doc/source/notes/7.rst
index 0234bc69..f19c21d7 100644
--- a/doc/source/notes/7.rst
+++ b/doc/source/notes/7.rst
@@ -6,12 +6,18 @@ Instructions for the upgrade can be found in the `upgrade guide <https://osism.g
 
 7.0.0a, 7.0.0b, 7.0.0c, 7.0.0d are pre-releases. Do not use these releases.
 
-7.0.3
+7.0.4
 =====
 
-Release date: 3. May 2024
+Release date: 7. May 2024
 
-* The Ceph service images have not been rebuilt. No upgrade of Ceph is required.
+Due to an error in the ``osism/sbom`` repository, the Nova and Octavia images were not updated as
+originally stated in the release notes for OSISM 7.0.3. Therefore it was unfortunately necessary
+to release a 7.0.4 which contains the correct SBOM. In 7.0.4 nothing has changed except the SBOM.
+The correct images for Nova and Octavia are now included in 7.0.4 and the bugs listed below have
+been fixed. An update of the Manager Service must be done and then, if required, an update of Nova
+and Octavia can be updated as originally planned for OSISM 7.0.3. We apologise for the mistake and
+the resulting effort.
 
 * The OpenStack service images for Octavia and Nova have been rebuilt. Upgrades of the Octavia
   and Nova services are recommended. No upgrades of other OpenStack and associated
@@ -26,6 +32,15 @@ Release date: 3. May 2024
   * When upgrading the Nova and Octavia API services, there is a short downtime of the APIs.
     This downtime is usually less than 1 minute.
 
+7.0.3
+=====
+
+Release date: 3. May 2024
+
+* The Ceph service images have not been rebuilt. No upgrade of Ceph is required.
+
+* The OpenStack service images have not been rebuilt. No upgrade of OpenStack is required.
+
 * During the preparation of the upgrades of the regions of the PCO a bug (`osism/issues#973 <https://github.com/osism/issues/issues/973>`_)
   has been noticed which leads to a delay of up to 2 minutes between the necessary container stops and starts.
   This is due to a bug in the service units of all Kolla services. The bug is fixed in the current release.