Merge "Update release-mappings and api version data for Stein release"

doc/source/contributor/webapi-version-history.rst

@@ -2,7 +2,16 @@
 REST API Version History
 ========================
 
-1.55 (Stein, master)
+1.56 (Stein, 12.1.0)
+--------------------
+
+Added the ability for the ``configdrive`` parameter submitted with
+the deployment of a node, to include a ``meta_data``, ``network_data``
+and ``user_data`` dictionary fields. Ironic will now use the supplied
+data to create a configuration drive for the user. Prior uses of the
+``configdrive`` field are unaffected.
+
+1.55 (Stein, 12.1.0)
 --------------------
 
 Added the following new endpoints for deploy templates:
@@ -16,7 +25,7 @@ Added the following new endpoints for deploy templates:
 * ``DELETE /v1/deploy_templates/<deploy template identifier>`` to delete a
   deploy template.
 
-1.54 (Stein, master)
+1.54 (Stein, 12.1.0)
 --------------------
 
 Added new endpoints for external ``events``:
@@ -24,14 +33,14 @@ Added new endpoints for external ``events``:
 * POST /v1/events for creating events. (This endpoint is only intended for
   internal consumption.)
 
-1.53 (Stein, master)
+1.53 (Stein, 12.1.0)
 --------------------
 
 Added ``is_smartnic`` field to the port object to enable Smart NIC port
 creation in addition to local link connection attributes ``port_id`` and
 ``hostname``.
 
-1.52 (Stein, master)
+1.52 (Stein, 12.1.0)
 --------------------
 
 Added allocation API, allowing reserving a node for deployment based on
@@ -48,13 +57,13 @@ resource class and traits. The new endpoints are:
 
 Also added a new field ``allocation_uuid`` to the node resource.
 
-1.51 (Stein, master)
+1.51 (Stein, 12.1.0)
 --------------------
 
 Added ``description`` field to the node object to enable operators to store
 any information relates to the node. The field is limited to 4096 characters.
 
-1.50 (Stein, master)
+1.50 (Stein, 12.1.0)
 --------------------
 
 Added ``owner`` field to the node object to enable operators to store
@@ -62,20 +71,20 @@ information in relation to the owner of a node. The field is up to 255
 characters and MAY be used in a later point in time to allow designation
 and deligation of permissions.
 
-1.49 (Stein, master)
+1.49 (Stein, 12.0.0)
 --------------------
 
 Added new endpoints for retrieving conductors information, and added a
 ``conductor`` field to node object.
 
-1.48 (Stein, master)
+1.48 (Stein, 12.0.0)
 --------------------
 
 Added ``protected`` field to the node object to allow protecting deployed nodes
 from undeploying, rebuilding or deletion. Also added ``protected_reason``
 to specify the reason of making the node protected.
 
-1.47 (Stein, master)
+1.47 (Stein, 12.0.0)
 --------------------
 
 Added ``automated_clean`` field to the node object, enabling cleaning per node.

ironic/common/release_mappings.py

@@ -130,15 +130,47 @@ RELEASE_MAPPING = {
             'VolumeTarget': ['1.0'],
         }
     },
+    '12.0': {
+        'api': '1.49',
+        'rpc': '1.47',
+        'objects': {
+            'Node': ['1.29', '1.28'],
+            'Conductor': ['1.3'],
+            'Chassis': ['1.3'],
+            'Port': ['1.8'],
+            'Portgroup': ['1.4'],
+            'Trait': ['1.0'],
+            'TraitList': ['1.0'],
+            'VolumeConnector': ['1.0'],
+            'VolumeTarget': ['1.0'],
+        }
+    },
+    '12.1': {
+        'api': '1.56',
+        'rpc': '1.48',
+        'objects': {
+            'Allocation': ['1.0'],
+            'Node': ['1.32', '1.31', '1.30'],
+            'Conductor': ['1.3'],
+            'Chassis': ['1.3'],
+            'DeployTemplate': ['1.0', '1.1'],
+            'Port': ['1.9'],
+            'Portgroup': ['1.4'],
+            'Trait': ['1.0'],
+            'TraitList': ['1.0'],
+            'VolumeConnector': ['1.0'],
+            'VolumeTarget': ['1.0'],
+        }
+    },
     'master': {
         'api': '1.56',
         'rpc': '1.48',
         'objects': {
             'Allocation': ['1.0'],
-            'Node': ['1.32', '1.31', '1.30', '1.29', '1.28'],
+            'Node': ['1.32'],
             'Conductor': ['1.3'],
             'Chassis': ['1.3'],
-            'DeployTemplate': ['1.0', '1.1'],
+            'DeployTemplate': ['1.1'],
             'Port': ['1.9'],
             'Portgroup': ['1.4'],
             'Trait': ['1.0'],
@@ -162,9 +194,9 @@ RELEASE_MAPPING = {
 #
 #            There should be at most two named mappings here.
 
-# NOTE(TheJulia): remove queens prior to the Stein release.
-RELEASE_MAPPING['queens'] = RELEASE_MAPPING['10.1']
+# NOTE(TheJulia): remove Rocky prior to the Train release.
 RELEASE_MAPPING['rocky'] = RELEASE_MAPPING['11.1']
+RELEASE_MAPPING['stein'] = RELEASE_MAPPING['12.1']
 
 # List of available versions with named versions first; 'master' is excluded.
 RELEASE_VERSIONS = sorted(set(RELEASE_MAPPING) - {'master'}, reverse=True)