Prepare 18.0 and clean up release note

Release notes checked:
* releasenotes/notes/adding-security-param-clean-step-00d5548072a397f2.yaml
* releasenotes/notes/bios-interface-api-ref-ebf866cc7da2270b.yaml
* releasenotes/notes/bios-interface-api-ref-validate-ddb95461adb0e478.yaml
* releasenotes/notes/bios-registry-support-e7fd62908e9c222d.yaml
* releasenotes/notes/boot-validate-6b4b6b40c8e27273.yaml
* releasenotes/notes/bug-2007551-aliases-for-a-few-named-state-transitions-a32433ad65638706.yaml
* releasenotes/notes/bye-bye-iscsi-658920cf126db0b8.yaml
* releasenotes/notes/configdrive-render-8eb398d956393d60.yaml
* releasenotes/notes/create_node_indexes-841b679e6cf332fd.yaml
* releasenotes/notes/custom-agent-deploy-88989512c29a14c1.yaml
* releasenotes/notes/decomposed-steps-9644d3b5ccbad1ea.yaml
* releasenotes/notes/get-bios-registry-aadc74800e0770f7.yaml
* releasenotes/notes/irmc-append-params-380a281db43e6013.yaml
* releasenotes/notes/pxe-append-params-9cd5831959676371.yaml
* releasenotes/notes/redfish-append-params-4d28d922484c2731.yaml
* releasenotes/notes/redfish-deploy-iso-9671ae83108f6385.yaml
* releasenotes/notes/secure-rbac-policy-sanitization-performance-dc7886952144bb04.yaml

Change-Id: I8b27df7e9c9b7f8623aa22c82be77b74e7d183d8

8 files changed, 31 insertions, 15 deletions

diff --git a/doc/source/contributor/webapi-version-history.rst b/doc/source/contributor/webapi-version-history.rst
index 10816c529..ed17af161 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.74 (Xena)
+1.74 (Xena, 18.0)
 ----------------------
 
 Add support for BIOS registry fields which include details about the BIOS
@@ -12,7 +12,7 @@ Add a new selector to include the fields in the BIOS settings list:
 Also add a fields selector to the the BIOS settings list:
 * ``/v1/nodes/{node_ident}/bios/?fields=``
 
-1.73 (Xena)
+1.73 (Xena, 18.0)
 ----------------------
 
 Add a new ``deploy`` verb as an alias to ``active`` and
diff --git a/ironic/common/release_mappings.py b/ironic/common/release_mappings.py
index 29cde3fc0..91fff4714 100644
--- a/ironic/common/release_mappings.py
+++ b/ironic/common/release_mappings.py
@@ -319,6 +319,25 @@ RELEASE_MAPPING = {
             'VolumeTarget': ['1.0'],
         }
     },
+    '18.0': {
+        'api': '1.74',
+        'rpc': '1.54',
+        'objects': {
+            'Allocation': ['1.1'],
+            'BIOSSetting': ['1.1'],
+            'Node': ['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.74',
         'rpc': '1.54',
diff --git a/releasenotes/notes/bios-interface-api-ref-ebf866cc7da2270b.yaml b/releasenotes/notes/bios-interface-api-ref-ebf866cc7da2270b.yaml
index 60cc4e2bc..0b847132a 100644
--- a/releasenotes/notes/bios-interface-api-ref-ebf866cc7da2270b.yaml
+++ b/releasenotes/notes/bios-interface-api-ref-ebf866cc7da2270b.yaml
@@ -1,6 +1,4 @@
 ---
 fixes:
   - |
-    The bios_interface is included in the detailed node list and node
-    show but it wasn't part of the api reference spec. This fix adds it
-    to the api-ref.
+    Adds ``bios_interface`` to the node list and node show api-ref.
diff --git a/releasenotes/notes/bios-interface-api-ref-validate-ddb95461adb0e478.yaml b/releasenotes/notes/bios-interface-api-ref-validate-ddb95461adb0e478.yaml
index 93a6dd822..3bbcff242 100644
--- a/releasenotes/notes/bios-interface-api-ref-validate-ddb95461adb0e478.yaml
+++ b/releasenotes/notes/bios-interface-api-ref-validate-ddb95461adb0e478.yaml
@@ -1,5 +1,4 @@
 ---
 fixes:
   - |
-    The bios_interface is returned in the node validate API but it's not in the
-    api-ref documentation. This change adds it to the documentation.
+    Adds ``bios_interface`` to the node validate api-ref.
diff --git a/releasenotes/notes/boot-validate-6b4b6b40c8e27273.yaml b/releasenotes/notes/boot-validate-6b4b6b40c8e27273.yaml
index 282ac630d..eb67fee3c 100644
--- a/releasenotes/notes/boot-validate-6b4b6b40c8e27273.yaml
+++ b/releasenotes/notes/boot-validate-6b4b6b40c8e27273.yaml
@@ -1,7 +1,7 @@
 ---
 fixes:
   - |
-    When local boot is used (e.g. by default), the instance image validation
+    When local boot is used (e.g., by default), the instance image validation
     now happens only in the deploy interface, not in the boot interface (as
-    before). This means that the boot interface validation will now pass
-    in many cases where it would previously fail.
+    before). Meaning that the boot interface validation will now pass in many
+    cases where it would previously fail.
diff --git a/releasenotes/notes/bug-2007551-aliases-for-a-few-named-state-transitions-a32433ad65638706.yaml b/releasenotes/notes/bug-2007551-aliases-for-a-few-named-state-transitions-a32433ad65638706.yaml
index 387b8a7ee..662b3b4b2 100644
--- a/releasenotes/notes/bug-2007551-aliases-for-a-few-named-state-transitions-a32433ad65638706.yaml
+++ b/releasenotes/notes/bug-2007551-aliases-for-a-few-named-state-transitions-a32433ad65638706.yaml
@@ -2,5 +2,5 @@
 features:
   - |
     Adds a new ``deploy`` verb as an alias to ``active`` and
-    ``undeploy`` verb as an alias to ``deleted``
+    ``undeploy`` verb as an alias to ``deleted``.
     See `story 2007551 <https://storyboard.openstack.org/#!/story/2007551>`_.
\ No newline at end of file
diff --git a/releasenotes/notes/create_node_indexes-841b679e6cf332fd.yaml b/releasenotes/notes/create_node_indexes-841b679e6cf332fd.yaml
index 2de6f7902..ac312900a 100644
--- a/releasenotes/notes/create_node_indexes-841b679e6cf332fd.yaml
+++ b/releasenotes/notes/create_node_indexes-841b679e6cf332fd.yaml
@@ -1,7 +1,7 @@
 ---
 upgrade:
   - |
-    The ``ironic-dbsync upgrade`` command for this verison of ironic will add
+    The ``ironic-dbsync upgrade`` command for this version of ironic will add
     additional database indexes on the ``nodes`` table columns below.
     Depending on database size and complexity, this will take time to complete
     for every single index to be created. On MySQL or MariaDB, these indexes
@@ -23,12 +23,12 @@ upgrade:
 
     In testing with mock data, each column took approximately about 4 seconds
     per column to be indexed on a database with 115,000 rows. The existing
-    database size, and underlying server load will casue this time to vary.
+    database size and underlying server load will cause this time to vary.
     Sample queries also reduced result generation from an average of ``0.40``
     seconds to an average of ``0.02`` seconds with a test data set.
 fixes:
   - |
-    Improves lower level performance issues with database activity where some
+    Improves lower-level performance issues with database activity where some
     often queried columns were not indexed when the database model was created,
     or as the model evolved. Operators seeking to pre-create these indexes may
     do so prior to upgrading. Please consult the
diff --git a/releasenotes/notes/redfish-append-params-4d28d922484c2731.yaml b/releasenotes/notes/redfish-append-params-4d28d922484c2731.yaml
index 1f3872934..53040975b 100644
--- a/releasenotes/notes/redfish-append-params-4d28d922484c2731.yaml
+++ b/releasenotes/notes/redfish-append-params-4d28d922484c2731.yaml
@@ -10,5 +10,5 @@ deprecations:
   - |
     The ``ilo-virtual-media`` boot interface has previously declared support
     for the ``ilo_kernel_append_params`` option in ``driver_info``. It has
-    never been implemented in reality and has been replaces by the new
+    never been implemented in reality and has been replaced by the new
     ``kernel_append_params``.