Prepare 18.1 and clean up release notes

Change-Id: I8f33eefdce7a60fa8e48225ec20a801b3d1222f0

5 files changed, 29 insertions, 13 deletions

diff --git a/doc/source/contributor/webapi-version-history.rst b/doc/source/contributor/webapi-version-history.rst
index 325c87e13..37cda3595 100644
--- a/doc/source/contributor/webapi-version-history.rst
+++ b/doc/source/contributor/webapi-version-history.rst
@@ -2,7 +2,7 @@
 REST API Version History
 ========================
 
-1.75 (Xena, ?)
+1.75 (Xena, 18.1)
 ----------------------
 Add `boot_mode` and `secure_boot` to node object and expose their state at:
 
diff --git a/ironic/common/release_mappings.py b/ironic/common/release_mappings.py
index 4a12a1d76..e7c2c6912 100644
--- a/ironic/common/release_mappings.py
+++ b/ironic/common/release_mappings.py
@@ -351,6 +351,25 @@ RELEASE_MAPPING = {
             'VolumeTarget': ['1.0'],
         }
     },
+    '18.1': {
+        'api': '1.75',
+        'rpc': '1.54',
+        'objects': {
+            'Allocation': ['1.1'],
+            'BIOSSetting': ['1.1'],
+            'Node': ['1.36', '1.35'],
+            '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.75',
         'rpc': '1.54',
diff --git a/releasenotes/notes/configdrive-support-in-anaconda-deploy-f2aad59b4ff809ec.yaml b/releasenotes/notes/configdrive-support-in-anaconda-deploy-f2aad59b4ff809ec.yaml
index 5b11a11f3..5cdfab69b 100644
--- a/releasenotes/notes/configdrive-support-in-anaconda-deploy-f2aad59b4ff809ec.yaml
+++ b/releasenotes/notes/configdrive-support-in-anaconda-deploy-f2aad59b4ff809ec.yaml
@@ -2,8 +2,8 @@
 features:
   - |
     The anaconda deploy interface now handles config drive. The config drive
-    contents are written to the disk at /var/lib/cloud/seed/config_drive
+    contents are written to the disk in the /var/lib/cloud/seed/config_drive
     directory by the driver via kickstart files %post section. cloud-init
-    should be able to pick up the the config drive information and process
-    them. Because the config drive is extracted on to disk as plain text files
-    tools like glean will not work with this deploy interface.
+    picks up the the config drive information and processes them.
+    Because the config drive is extracted on to disk as plain text files,
+    tools like glean do not work with this deploy interface.
diff --git a/releasenotes/notes/deploy-iso-swift-355ad6eba6c511b4.yaml b/releasenotes/notes/deploy-iso-swift-355ad6eba6c511b4.yaml
index 737e6685d..4a8829bc7 100644
--- a/releasenotes/notes/deploy-iso-swift-355ad6eba6c511b4.yaml
+++ b/releasenotes/notes/deploy-iso-swift-355ad6eba6c511b4.yaml
@@ -2,6 +2,7 @@
 features:
   - |
     The configuration option ``[deploy]ramdisk_image_download_source`` now
-    supports a new value ``swift``. If ``boot_iso`` or ``deploy_iso`` is a
-    Glance image, it will expose it via a Swift temporary URL. For other types
-    of images the new value works the same way as the existing ``http``.
+    supports a new value ``swift``. If set, and if ``boot_iso`` or
+    ``deploy_iso`` is a Glance image, the image is exposed via a Swift
+    temporary URL. For other types of images the new value works the same
+    way as the existing ``http`` value.
diff --git a/releasenotes/notes/node-boot-mode-0662effa2a2644dc.yaml b/releasenotes/notes/node-boot-mode-0662effa2a2644dc.yaml
index caf092144..2832fd044 100644
--- a/releasenotes/notes/node-boot-mode-0662effa2a2644dc.yaml
+++ b/releasenotes/notes/node-boot-mode-0662effa2a2644dc.yaml
@@ -1,14 +1,10 @@
 ---
-
 features:
-
   - |
     Adds ``boot_mode`` and ``secure_boot`` fields to node. These indicate the
     boot mode (bios/uefi) and secure boot state (True/False) detected in the
     most recent power sync or during transition to the ``manageable`` state.
     If underlying driver does not support detecting these, they shall be
     populated with null values.
-
-    These fields are also be available under a node's states endpoint:
-
+    These fields are also available under a node's states endpoint:
     * ``/v1/nodes/{node_ident}/states``