From 31afe4ff645455d334cdc20b80f04bc2bbe2e85b Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Thu, 26 Jul 2018 13:21:01 -0700
Subject: [PATCH] Prepare for Rocky release

Change-Id: Ie9fe6846b8945640d44db6f3c85aa9bfbfa073a1
---
 .../contributor/webapi-version-history.rst    | 10 ++++++++--
 ironic/common/release_mappings.py             | 20 ++++++++++++++++++-
 .../ironic-11.1-prelude-b5ba8134953db4c2.yaml | 17 ++++++++++++++++
 3 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/ironic-11.1-prelude-b5ba8134953db4c2.yaml

diff --git a/doc/source/contributor/webapi-version-history.rst b/doc/source/contributor/webapi-version-history.rst
index 81522fb5a8..f52145a7a1 100644
--- a/doc/source/contributor/webapi-version-history.rst
+++ b/doc/source/contributor/webapi-version-history.rst
@@ -2,13 +2,19 @@
 REST API Version History
 ========================
 
-1.45 (Rocky, master)
+1.46 (Rocky, 11.1.0)
+--------------------
+Added ``conductor_group`` field to the node and the node response,
+as well as support to the API to return results by matching
+the parameter.
+
+1.45 (Rocky, 11.1.0)
 --------------------
 
 Added ``reset_interfaces`` parameter to node's PATCH request, to specify
 whether to reset hardware interfaces to their defaults on driver's update.
 
-1.44 (Rocky, master)
+1.44 (Rocky, 11.1.0)
 --------------------
 
 Added ``deploy_step`` to the node object, to indicate the current deploy
diff --git a/ironic/common/release_mappings.py b/ironic/common/release_mappings.py
index 855702b42a..99ac4851ae 100644
--- a/ironic/common/release_mappings.py
+++ b/ironic/common/release_mappings.py
@@ -114,11 +114,26 @@ RELEASE_MAPPING = {
             'VolumeTarget': ['1.0'],
         }
     },
+    '11.1': {
+        'api': '1.46',
+        'rpc': '1.47',
+        'objects': {
+            'Node': ['1.27', '1.26'],
+            'Conductor': ['1.3'],
+            'Chassis': ['1.3'],
+            'Port': ['1.8'],
+            'Portgroup': ['1.4'],
+            'Trait': ['1.0'],
+            'TraitList': ['1.0'],
+            'VolumeConnector': ['1.0'],
+            'VolumeTarget': ['1.0'],
+        }
+    },
     'master': {
         'api': '1.46',
         'rpc': '1.47',
         'objects': {
-            'Node': ['1.26', '1.27'],
+            'Node': ['1.27'],
             'Conductor': ['1.3'],
             'Chassis': ['1.3'],
             'Port': ['1.8'],
@@ -143,7 +158,10 @@ RELEASE_MAPPING = {
 #            release (that we are no longer supporting for a rolling upgrade).
 #
 #            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']
+RELEASE_MAPPING['rocky'] = RELEASE_MAPPING['11.1']
 
 # List of available versions with named versions first; 'master' is excluded.
 RELEASE_VERSIONS = sorted(set(RELEASE_MAPPING) - {'master'}, reverse=True)
diff --git a/releasenotes/notes/ironic-11.1-prelude-b5ba8134953db4c2.yaml b/releasenotes/notes/ironic-11.1-prelude-b5ba8134953db4c2.yaml
new file mode 100644
index 0000000000..7195ae7551
--- /dev/null
+++ b/releasenotes/notes/ironic-11.1-prelude-b5ba8134953db4c2.yaml
@@ -0,0 +1,17 @@
+---
+prelude: |
+    Ironic `11.1`... Where the volume dial turned more!
+
+    While Pixie Boots has rocked out to Rock and Roll, the Bare Metal
+    as a Service team has wrapped up our Rocky release with 11.1.
+    This new release contains a number of major features that we hope
+    will improve the lives of bare metal operators everywhere!
+
+    * Conductor grouping enabling nodes to be assigned to groups
+      of different conductors.
+    * Deployment steps framework enabling greater flexibility
+      for deployers to request specific steps.
+    * Bios setting interfaces for the ``ilo`` and ``irmc`` hardware types.
+    * Ramdisk deployment interface for disk-less deployments.
+    * Capability to reset nodes to their default interfaces via the API
+      when resetting the node's driver.