From aefc623c9949e823140816e94b664c244e69ae24 Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <iurygregory@gmail.com>
Date: Tue, 22 Mar 2022 18:32:38 -0300
Subject: [PATCH] Prepare Yoga release with 20.1

This is a pre-release commit for the Yoga release following our docs [1]

* No API additions during this cycle (no need to update
  doc/source/contributor/webapi-version-history.rst)
* Add prelude releasenote
* Fix highlight in one releasenote

[1] https://docs.openstack.org/ironic/latest/contributor/releasing.html

Change-Id: If26019c5abc0643051f4b11186d7eb819f9c407b
---
 ironic/common/release_mappings.py             | 24 +++++++++++++++++--
 .../unit/common/test_release_mappings.py      |  2 +-
 .../notes/20.1-prelude-612672742f417477.yaml  |  7 ++++++
 ...da-instance-info-fix-a51837d8ac7b41de.yaml |  8 +++----
 4 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 releasenotes/notes/20.1-prelude-612672742f417477.yaml

diff --git a/ironic/common/release_mappings.py b/ironic/common/release_mappings.py
index 889fa77fd8..bae1a95c58 100644
--- a/ironic/common/release_mappings.py
+++ b/ironic/common/release_mappings.py
@@ -430,6 +430,26 @@ RELEASE_MAPPING = {
             'VolumeTarget': ['1.0'],
         }
     },
+    '20.1': {
+        'api': '1.78',
+        'rpc': '1.55',
+        'objects': {
+            'Allocation': ['1.1'],
+            'BIOSSetting': ['1.1'],
+            'Node': ['1.36'],
+            'NodeHistory': ['1.0'],
+            'Conductor': ['1.3'],
+            'Chassis': ['1.3'],
+            'Deployment': ['1.0'],
+            'DeployTemplate': ['1.1'],
+            'Port': ['1.10'],
+            'Portgroup': ['1.4'],
+            'Trait': ['1.0'],
+            'TraitList': ['1.0'],
+            'VolumeConnector': ['1.0'],
+            'VolumeTarget': ['1.0'],
+        }
+    },
     'master': {
         'api': '1.78',
         'rpc': '1.55',
@@ -465,9 +485,9 @@ RELEASE_MAPPING = {
 #
 #            There should be at most two named mappings here.
 
-# NOTE(mgoddard): remove wallaby prior to the yoga release.
-RELEASE_MAPPING['wallaby'] = RELEASE_MAPPING['17.0']
+# NOTE(mgoddard): remove xena prior to the zed release.
 RELEASE_MAPPING['xena'] = RELEASE_MAPPING['18.2']
+RELEASE_MAPPING['yoga'] = RELEASE_MAPPING['20.1']
 
 # List of available versions with named versions first; 'master' is excluded.
 RELEASE_VERSIONS = sorted(set(RELEASE_MAPPING) - {'master'}, reverse=True)
diff --git a/ironic/tests/unit/common/test_release_mappings.py b/ironic/tests/unit/common/test_release_mappings.py
index 8eaa690620..da1eeedd21 100644
--- a/ironic/tests/unit/common/test_release_mappings.py
+++ b/ironic/tests/unit/common/test_release_mappings.py
@@ -44,7 +44,7 @@ NUMERIC_RELEASES = sorted(
     map(versionutils.convert_version_to_tuple,
         set(release_mappings.RELEASE_MAPPING)
         # Update the exceptions whenever needed
-        - {'master', 'xena', 'wallaby'}),
+        - {'master', 'yoga', 'xena'}),
     reverse=True)
 
 
diff --git a/releasenotes/notes/20.1-prelude-612672742f417477.yaml b/releasenotes/notes/20.1-prelude-612672742f417477.yaml
new file mode 100644
index 0000000000..2ae47b4ff3
--- /dev/null
+++ b/releasenotes/notes/20.1-prelude-612672742f417477.yaml
@@ -0,0 +1,7 @@
+---
+prelude: |
+    The Ironic community is pleased to announce the release of Ironic 20.1.
+
+    During the Yoga cycle, we were able to add improvements that will make 
+    it easier to deploy and operate. Our community will be happy to assist
+    if you have any questions!
diff --git a/releasenotes/notes/anaconda-instance-info-fix-a51837d8ac7b41de.yaml b/releasenotes/notes/anaconda-instance-info-fix-a51837d8ac7b41de.yaml
index 314d3ae9ce..31cdf2df31 100644
--- a/releasenotes/notes/anaconda-instance-info-fix-a51837d8ac7b41de.yaml
+++ b/releasenotes/notes/anaconda-instance-info-fix-a51837d8ac7b41de.yaml
@@ -2,8 +2,8 @@
 fixes:
   - |
     The anaconda deploy interface was saving internal information in
-    the node's instance_info, in the user-facing 'stage2' and
-    'ks_template' fields. This broke rebuilds using a different image
-    with different stage2 or template specified in the image properties.
+    the node's ``instance_info``, in the user-facing ``stage2`` and
+    ``ks_template`` fields. This broke rebuilds using a different image
+    with different ``stage2`` or template specified in the image properties.
     This has been fixed by saving the information in the node's
-    driver_internal_info instead.
+    ``driver_internal_info`` instead.