Prepare release notes and docs for release 15.1

Change-Id: I14ac07661b8741684dcf77ced9e782b57c947d79

8 files changed, 28 insertions, 28 deletions

diff --git a/doc/source/contributor/webapi-version-history.rst b/doc/source/contributor/webapi-version-history.rst
index 49c9cbad0..3ac63c403 100644
--- a/doc/source/contributor/webapi-version-history.rst
+++ b/doc/source/contributor/webapi-version-history.rst
@@ -2,6 +2,15 @@
 REST API Version History
 ========================
 
+1.67 (Victoria, master)
+-----------------------
+
+Add support for the mutually exclusive ``port_uuid`` and ``portgroup_uuid``
+fields by having the node vif_attach API accept those values within
+``vif_info``.
+If one is specified, then Ironic will attempt to attach a VIF to the relative
+port or portgroup.
+
 1.66 (Victoria, master)
 -----------------------
 
diff --git a/releasenotes/notes/add-ibmc-raid-interface-0c13826e134fb4ce.yaml b/releasenotes/notes/add-ibmc-raid-interface-0c13826e134fb4ce.yaml
index 2ab644aaf..2bac1e5f3 100644
--- a/releasenotes/notes/add-ibmc-raid-interface-0c13826e134fb4ce.yaml
+++ b/releasenotes/notes/add-ibmc-raid-interface-0c13826e134fb4ce.yaml
@@ -1,5 +1,5 @@
 ---
 features:
   - |
-    Add raid interface for ibmc driver which includes ``delete_configuration``
+    Adds raid interface for ibmc driver which includes ``delete_configuration``
     and ``create_configuration`` steps.
diff --git a/releasenotes/notes/agent-power-off-2115fcfaac030bd0.yaml b/releasenotes/notes/agent-power-off-2115fcfaac030bd0.yaml
index 74f84fbab..f6fca6117 100644
--- a/releasenotes/notes/agent-power-off-2115fcfaac030bd0.yaml
+++ b/releasenotes/notes/agent-power-off-2115fcfaac030bd0.yaml
@@ -1,5 +1,5 @@
 ---
 fixes:
   - |
-    Fixes a rare issue when agent successfully powers off a node after
+    Fixes a rare issue where agent successfully powers off a node after
     deployment, but ironic never learns about it and does another reboot.
diff --git a/releasenotes/notes/disable_periodic_task-590a91c0a5235cfb.yaml b/releasenotes/notes/disable_periodic_task-590a91c0a5235cfb.yaml
index a613be665..d7b23f16f 100644
--- a/releasenotes/notes/disable_periodic_task-590a91c0a5235cfb.yaml
+++ b/releasenotes/notes/disable_periodic_task-590a91c0a5235cfb.yaml
@@ -2,7 +2,6 @@
 fixes:
   - |
     Fixes periodic task initialization options to prevent a negative number.
-
-    If "[conductor]clean_callback_timeout","[conductor]inspect_wait_timeout"
-    and "[conductor]inspect_wait_timeout" are a negative value will cause an
-    error on start up from now on.
\ No newline at end of file
+    If ``[conductor]clean_callback_timeout``, ``[conductor]inspect_wait_timeout``
+    or ``[conductor]inspect_wait_timeout`` have a negative value an error
+    will be triggered.
diff --git a/releasenotes/notes/http-basic-auth-f8c0536eba989918.yaml b/releasenotes/notes/http-basic-auth-f8c0536eba989918.yaml
index 1f0c8df18..356df84ed 100644
--- a/releasenotes/notes/http-basic-auth-f8c0536eba989918.yaml
+++ b/releasenotes/notes/http-basic-auth-f8c0536eba989918.yaml
@@ -23,10 +23,12 @@ features:
     bcrypt passwords as generated by the Apache htpasswd utility.
 
     To try HTTP basic authentication, the following can be done:
+
     * Set ``/etc/ironic/ironic.conf`` ``DEFAULT`` ``auth_strategy`` to
-    * ``http_basic`` Populate the htpasswd file with entries, for example:
-    ``htpasswd -nbB myName myPassword >> /etc/ironic/htpassw
+      ``http_basic``
+    * Populate the htpasswd file with entries, for example:
+      ``htpasswd -nbB myName myPassword >> /etc/ironic/htpassw``
     * Make basic authenticated HTTP requests, for example:
-    ``curl --user myName:myPassword http://localhost:6385/v1/drivers``
+      ``curl --user myName:myPassword http://localhost:6385/v1/drivers``
 
     [1] https://httpd.apache.org/docs/current/misc/password_encryptions.html
diff --git a/releasenotes/notes/json-rpc-timeout-ac30eea164b3a294.yaml b/releasenotes/notes/json-rpc-timeout-ac30eea164b3a294.yaml
index 74be9a31b..b177d8e8b 100644
--- a/releasenotes/notes/json-rpc-timeout-ac30eea164b3a294.yaml
+++ b/releasenotes/notes/json-rpc-timeout-ac30eea164b3a294.yaml
@@ -3,5 +3,5 @@ fixes:
   - |
     Fixes the JSON RPC backend potentially hanging on inability to connect
     to a conductor. The default timeout is now 120 seconds. The timeout and
-    a number of retries can be adjusted via the configuration options
+    the number of retries can be adjusted via the configuration options
     ``[json_rpc]timeout`` and ``[json_rpc]connect_retries`` accordingly.
diff --git a/releasenotes/notes/netboot-fallback-b208b2c3b40a0d01.yaml b/releasenotes/notes/netboot-fallback-b208b2c3b40a0d01.yaml
index 637464b88..61f61a15f 100644
--- a/releasenotes/notes/netboot-fallback-b208b2c3b40a0d01.yaml
+++ b/releasenotes/notes/netboot-fallback-b208b2c3b40a0d01.yaml
@@ -8,5 +8,5 @@ features:
   - |
     Adds an ability to generate network boot templates even for nodes that
     use local boot via the new ``[pxe]enable_netboot_fallback`` option.
-    This is required to work around the situation when switching boot devices
+    This is required to work around the situation where switching boot devices
     does not work reliably.
diff --git a/releasenotes/notes/redfish-virtual-media-permission-fix-1909b9cdbbbf9fd1.yaml b/releasenotes/notes/redfish-virtual-media-permission-fix-1909b9cdbbbf9fd1.yaml
index 6e0afab9b..fb0bfed67 100644
--- a/releasenotes/notes/redfish-virtual-media-permission-fix-1909b9cdbbbf9fd1.yaml
+++ b/releasenotes/notes/redfish-virtual-media-permission-fix-1909b9cdbbbf9fd1.yaml
@@ -1,25 +1,15 @@
 ---
 upgrade:
   - |
-    Operators may need to check their ``/httpboot/redfish`` folder permissions
-    if using ``redfish-virtual-media``. The conductor was previously creating
-    the folder with incorrect permissions.
-  - |
     A permission setting has been added for ``redfish-virtual-media`` boot
     interface, which allows for explicit file permission setting when the
-    driver is being used. The default for the new ``[redfish]file_permission
+    driver is used. The default for the new ``[redfish]file_permission
     setting is ``0u644``, or 644 if manually changed using ``chmod`` on the
-    command line. Operators MAY need to adjust this if they were running the
-    conductor with a specific ``umask`` to work around the permission setting
-    defect.
+    command line.
+    Operators may need to check ``/httpboot/redfish`` folder permissions if
+    using ``redfish-virtual-media`` if they were running the conductor with
+    a specific ``umask`` to work around the permission setting defect.
 fixes:
   - |
-    Fixes the ``redfish-virtual-media`` and related based drivers to utilize
-    an explicit file permission instead of rely upon the ironic-conductor
-    umask, which may be incorrect. This can be tuned with the
-    ``[redfish]file_permission`` setting.
-  - |
-    Fixes an issue where the default folder permission for the
-    ``redfish-virtual-media`` driver where the folder permissions for the
-    ``/httpboot/redfish`` folder was being created with incorrect
-    permissions.
+    Fixes an issue where the folder ``/httpboot/redfish`` was being created
+    with incorrect permissions.