Merge "Prepare for bugfix release"

8 files changed, 34 insertions, 31 deletions

diff --git a/releasenotes/notes/add-idrac-verify-steps-50c1a0f0fe299922.yaml b/releasenotes/notes/add-idrac-verify-steps-50c1a0f0fe299922.yaml
index ef854087f..c8175b97f 100644
--- a/releasenotes/notes/add-idrac-verify-steps-50c1a0f0fe299922.yaml
+++ b/releasenotes/notes/add-idrac-verify-steps-50c1a0f0fe299922.yaml
@@ -1,9 +1,9 @@
 ---
 features:
   - |
-    Adding support for running ``management.clear_job_queue``,
+    Adds support for running ``management.clear_job_queue``,
     ``management.reset_idrac`` and ``management.known_good_state`` methods as
     verify steps on iDRAC hardware type, for both ``idrac-wsman`` and
     ``idrac-redfish`` interfaces. In order to use this feature,
     ``[conductor]verify_step_priority_override`` needs to be used to set
-    non-zero step priorties for the desired verify steps.
+    non-zero step priorities for the desired verify steps.
diff --git a/releasenotes/notes/fix-anaconda-deploy-interface-bfa2cfca22b04680.yaml b/releasenotes/notes/fix-anaconda-deploy-interface-bfa2cfca22b04680.yaml
index e791d7fdd..70e2823e6 100644
--- a/releasenotes/notes/fix-anaconda-deploy-interface-bfa2cfca22b04680.yaml
+++ b/releasenotes/notes/fix-anaconda-deploy-interface-bfa2cfca22b04680.yaml
@@ -1,25 +1,25 @@
 ---
 fixes:
   - |
-    Fixes a bug in the anaconda deploy interface where the 'ks_options'
+    Fixes a bug in the anaconda deploy interface where the ``ks_options``
     key was not found when rendering the default kickstart template.
   - |
-    Fixes issue where PXEAnacondaDeploy interface's deploy() method did not
-    return states.DEPLOYWAIT so the instance went straight to 'active' instead
-    of 'wait call-back'.
+    Fixes an issue where PXEAnacondaDeploy interface's deploy() method did not
+    return states.DEPLOYWAIT so the instance went straight to ``active`` instead
+    of ``wait call-back``.
   - |
     Fixes an issue where the anaconda deploy interface mistakenly expected
-    'squashfs_id' instead of 'stage2_id'  property on the image.
+    ``squashfs_id`` instead of ``stage2_id``  property on the image.
   - |
     Fixes the heartbeat mechanism in the default kickstart template
-    ks.cfg.template as the heartbeat API only accepts 'POST' and expects a
-    mandatory 'callback_url' parameter.
+    ks.cfg.template as the heartbeat API only accepts ``POST`` and expects a
+    mandatory ``callback_url`` parameter.
   - |
     Fixes handling of tarball images in anaconda deploy interface. Allows user
     specified file extensions to be appended to the disk image symlink. Users
-    can now set the file extensions by setting the 'disk_file_extension'
+    can now set the file extensions by setting the ``disk_file_extension``
     property on the OS image. This enables users to deploy tarballs with
     anaconda deploy interface.
   - |
-    Fixes issue where automated cleaning was not supported when anaconda deploy
-    interface is used.
+    Fixes an issue where automated cleaning was not supported when anaconda
+    deploy interface is used.
diff --git a/releasenotes/notes/fix-idrac-wsman-deploy-with-existing-non-bios-jobs-78aa2195d0c3016f.yaml b/releasenotes/notes/fix-idrac-wsman-deploy-with-existing-non-bios-jobs-78aa2195d0c3016f.yaml
index b9382d3b9..b2a0a7060 100644
--- a/releasenotes/notes/fix-idrac-wsman-deploy-with-existing-non-bios-jobs-78aa2195d0c3016f.yaml
+++ b/releasenotes/notes/fix-idrac-wsman-deploy-with-existing-non-bios-jobs-78aa2195d0c3016f.yaml
@@ -2,11 +2,15 @@
 fixes:
   - |
     Fixes ``idrac-wsman`` management interface ``set_boot_device`` method that
-    would fail deployment when there are existing jobs present with error
-    "Failed to change power state to ''power on'' by ''rebooting''. Error: DRAC
-    operation failed. Reason: Unfinished config jobs found: <list of existing
-    jobs>. Make sure they are completed before retrying.". Now there can be
-    non-BIOS jobs present during deployment. This will still fail for cases
-    when there are BIOS jobs present. In such cases should consider moving to
-    ``idrac-redfish`` that does not have this limitation when setting boot
-    device.
\ No newline at end of file
+    would fail deployment when there are existing jobs present with
+    the error::
+
+      "Failed to change power state to ''power on'' by ''rebooting''.
+      Error: DRAC operation failed. Reason: Unfinished config jobs
+      found: <list of existing jobs>. Make sure they are completed
+      before retrying."
+
+    Now there can be non-BIOS jobs present during deployment.
+    This will still fail for cases when there are BIOS jobs present.
+    In such cases it's advised to use the ``idrac-redfish`` interface
+    that does not have this limitation when setting boot device.
diff --git a/releasenotes/notes/instance-info-interface-override-fix-043df41199529892.yaml b/releasenotes/notes/instance-info-interface-override-fix-043df41199529892.yaml
index 014d94274..112345be2 100644
--- a/releasenotes/notes/instance-info-interface-override-fix-043df41199529892.yaml
+++ b/releasenotes/notes/instance-info-interface-override-fix-043df41199529892.yaml
@@ -1,7 +1,7 @@
 ---
 fixes:
   - |
-    Fixes issue with a node's instance_info interface override caused when
+    Fixes an issue with a node's instance_info interface override caused when
     Ironic uses the interface attribute directly. Does so by adding a
-    `get_interface` method to a node, and updating the Ironic code to use it
-    where needed.
+    ``get_interface`` method to a node, and updating the Ironic code to use
+    it where needed.
diff --git a/releasenotes/notes/irmc-convert-the-value-of-irmc-port-63c90450b5a77203.yaml b/releasenotes/notes/irmc-convert-the-value-of-irmc-port-63c90450b5a77203.yaml
index 2a06a271d..5fcc76165 100644
--- a/releasenotes/notes/irmc-convert-the-value-of-irmc-port-63c90450b5a77203.yaml
+++ b/releasenotes/notes/irmc-convert-the-value-of-irmc-port-63c90450b5a77203.yaml
@@ -1,5 +1,5 @@
 ---
 fixes:
   - |
-    Fix the bug caused by not converting the port value to int type
-    when the node managed by the `irmc` hardware type.
+    Fixes an issue where the port value is not converted to int type
+    when nodes are managed by the ``irmc`` hardware type.
diff --git a/releasenotes/notes/irmc-fix-repeatedly-resuming-clean-020f0dfc2e30d7bc.yaml b/releasenotes/notes/irmc-fix-repeatedly-resuming-clean-020f0dfc2e30d7bc.yaml
index 02104cc18..1fc688273 100644
--- a/releasenotes/notes/irmc-fix-repeatedly-resuming-clean-020f0dfc2e30d7bc.yaml
+++ b/releasenotes/notes/irmc-fix-repeatedly-resuming-clean-020f0dfc2e30d7bc.yaml
@@ -1,7 +1,6 @@
 ---
 fixes:
   - |
-    Fixed the bug of repeated resume cleaning due to the value of
-    `fgi_status` not being updated correctly when obtaining the
-    RAID configuration status of the node managed by the `irmc`
-    hardware type.
+    Fixes an issue where cleaning continuously repeats due to the value of
+    ``fgi_status`` not being updated correctly when obtaining the RAID
+    configuration status of nodes managed by the ``irmc`` hardware type.
diff --git a/releasenotes/notes/iso-cache-5330b63c9e3a02db.yaml b/releasenotes/notes/iso-cache-5330b63c9e3a02db.yaml
index 502e6de58..3e4f1b50c 100644
--- a/releasenotes/notes/iso-cache-5330b63c9e3a02db.yaml
+++ b/releasenotes/notes/iso-cache-5330b63c9e3a02db.yaml
@@ -2,6 +2,6 @@
 features:
   - |
     ISO images provided via ``instance_info/boot_iso`` or
-    `instance_info/deploy_iso`` are now cached in a similar way to normal
+    ``instance_info/deploy_iso`` are now cached in a similar way to normal
     instance images. Set ``[deploy]iso_master_path`` to an empty string
     to disable.
diff --git a/releasenotes/notes/uefi-is-now-the-default-562b0d68adc59008.yaml b/releasenotes/notes/uefi-is-now-the-default-562b0d68adc59008.yaml
index dc84a5fed..7a234d80b 100644
--- a/releasenotes/notes/uefi-is-now-the-default-562b0d68adc59008.yaml
+++ b/releasenotes/notes/uefi-is-now-the-default-562b0d68adc59008.yaml
@@ -6,7 +6,7 @@ features:
     set their nodes, or deployment, appropriately.
 upgrade:
   - |
-    The default boot mode has been changed and now UEFI. Operators who
+    The default boot mode has been changed and is *now* UEFI. Operators who
     were explicitly relying upon BIOS based deployments in the past,
     may wish to consider setting an explicit node level override for
     the node to only utilize BIOS mode. This can be configured at a