Merge "Clean up release notes from the upcoming release"

13 files changed, 41 insertions, 64 deletions

diff --git a/releasenotes/notes/bfv-pxe-boot-3375d331ee2f04f2.yaml b/releasenotes/notes/bfv-pxe-boot-3375d331ee2f04f2.yaml
index 8aae1ce6f..406a0bfb3 100644
--- a/releasenotes/notes/bfv-pxe-boot-3375d331ee2f04f2.yaml
+++ b/releasenotes/notes/bfv-pxe-boot-3375d331ee2f04f2.yaml
@@ -1,5 +1,5 @@
 ---
 fixes:
-  - Fixes a problem when using boot from volume with the pxe boot interface,
-    now when booting the correct iscsi initiator is used.
-    `bug 1724275 <https://bugs.launchpad.net/ironic/+bug/1724275>`_
+  - Fixes a problem when using boot from volume with the ``pxe`` boot interface
+    (`bug 1724275 <https://bugs.launchpad.net/ironic/+bug/1724275>`_).
+    Now the correct iSCSI initiator is used.
diff --git a/releasenotes/notes/bug-1696296-a972c8d879b98940.yaml b/releasenotes/notes/bug-1696296-a972c8d879b98940.yaml
index eb9f19212..afb5c887b 100644
--- a/releasenotes/notes/bug-1696296-a972c8d879b98940.yaml
+++ b/releasenotes/notes/bug-1696296-a972c8d879b98940.yaml
@@ -5,5 +5,5 @@ fixes:
     the service could not report its heartbeat due to the database connection
     experiencing an unexpected failure. Full tracebacks of these exceptions are
     now logged, and if the database connection recovers in a reasonable amount
-    of time the service will still be available.
-    See https://bugs.launchpad.net/ironic/+bug/1696296.
\ No newline at end of file
+    of time the service will still be available. See `bug 1696296
+    <https://bugs.launchpad.net/ironic/+bug/1696296>`_ for details.
diff --git a/releasenotes/notes/fix-get-boot-device-not-persistent-5d6acffac3b287f7.yaml b/releasenotes/notes/fix-get-boot-device-not-persistent-5d6acffac3b287f7.yaml
index 2bd971c50..a5971afde 100644
--- a/releasenotes/notes/fix-get-boot-device-not-persistent-5d6acffac3b287f7.yaml
+++ b/releasenotes/notes/fix-get-boot-device-not-persistent-5d6acffac3b287f7.yaml
@@ -1,6 +1,6 @@
 ---
 fixes:
   - |
-    Fixes ``get_boot_device`` method from oneview drivers' management interface.
-    Now the method returns the persistent boot option correctly, based on the
-    iLO information of the node.
+    The ``oneview`` management interface now correctly detects whether the
+    current boot device setting is persistent. Previously it always
+    returned ``True``.
diff --git a/releasenotes/notes/introduce-hponeview-client-6652d468034963b2.yaml b/releasenotes/notes/introduce-hponeview-client-6652d468034963b2.yaml
deleted file mode 100644
index 12ba47f33..000000000
--- a/releasenotes/notes/introduce-hponeview-client-6652d468034963b2.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-upgrade:
-  - |
-    Adds the ``hpOneView`` and ``ilorest`` library requirement
-    to the OneView Driver, in order to prepare for the eventual
-    removal of dependency on ``python-oneviewclient`` library.
diff --git a/releasenotes/notes/keystoneauth-adapter-opts-ca4f68f568e6cf6f.yaml b/releasenotes/notes/keystoneauth-adapter-opts-ca4f68f568e6cf6f.yaml
index d2cde3f23..55dde5e96 100644
--- a/releasenotes/notes/keystoneauth-adapter-opts-ca4f68f568e6cf6f.yaml
+++ b/releasenotes/notes/keystoneauth-adapter-opts-ca4f68f568e6cf6f.yaml
@@ -1,41 +1,36 @@
 ---
-upgrade:
+features:
   - |
-    To facilitate automatic discovery of services from the keystone catalog,
+    To facilitate automatic discovery of services from the service catalog,
     the configuration file sections for service clients may include these
     configuration options: ``service_type``, ``service_name``,
-    ``valid_interfaces``, ``region_name`` and other keystoneauth Adaper-related
-    options.
+    ``valid_interfaces``, ``region_name`` and other keystoneauth options.
 
     These options together must uniquely specify an endpoint for a service
-    registered in the keystone catalog.
-    Consult the ``keystoneauth`` library documentation for full list of
+    registered in the service catalog. Alternatively, the ``endpoint_override``
+    option can be used to specify the endpoint.
+
+    Consult the `keystoneauth library documentation
+    <https://docs.openstack.org/keystoneauth/latest/>`_ for a full list of
     available options, their meaning and possible values.
 
     Default values for ``service_type`` are set by ironic to sane defaults
-    based on required services and their entries in ``service-types-authority``.
+    based on required services and their entries in the `service types
+    authority <https://service-types.openstack.org/service-types.json>`_.
 
     The ``valid_interfaces`` option defaults to ``['internal', 'public']``.
 
     The ``region_name`` option defaults to ``None`` and must be explicitly set
     for multi-regional setup for endpoint discovery to succeed.
 
-    The configuration file sections where these new options are available are:
-
-    - service_catalog
-
-features:
-  - |
-    Options for service endpoint discovery can now be set per-service in
-    appropriate service configuration file sections:
-
-    - ``[service_catalog]`` for baremetal API discovery
+    Currently only the ``[service_catalog]`` section supports these options.
 
 deprecations:
   - |
     Configuration option ``[conductor]api_url`` is deprecated
-    and will be ignored in the Rocky release.
-    Instead, use ``[service_catalog]endpoint_override`` configuration option
-    to set specific ironic API address if automatic discovery of ironic API
-    endpoint from keystone catalog is not desired.
+    and will be removed in the Rocky release. Instead, use the
+    ``[service_catalog]endpoint_override`` configuration option to set
+    the Bare Metal API endpoint if its automatic discovery from the service
+    catalog is not desired.
+
     This new option defaults to ``None`` and must be set explicitly if needed.
diff --git a/releasenotes/notes/new_capabilities-5241619c4b46a460.yaml b/releasenotes/notes/new_capabilities-5241619c4b46a460.yaml
index 4649beb38..4089668b6 100644
--- a/releasenotes/notes/new_capabilities-5241619c4b46a460.yaml
+++ b/releasenotes/notes/new_capabilities-5241619c4b46a460.yaml
@@ -2,7 +2,7 @@
 features:
   - |
     Adds support for the following Boolean capabilities keys to
-    ``ilo`` inspect interface:
+    the ``ilo`` inspect interface:
 
     * ``sriov_enabled``
     * ``has_ssd``
diff --git a/releasenotes/notes/oneview-timeout-power-88b02a9cd45876d7.yaml b/releasenotes/notes/oneview-timeout-power-88b02a9cd45876d7.yaml
index 01ad1af0b..63d1ee8ee 100644
--- a/releasenotes/notes/oneview-timeout-power-88b02a9cd45876d7.yaml
+++ b/releasenotes/notes/oneview-timeout-power-88b02a9cd45876d7.yaml
@@ -1,5 +1,5 @@
 ---
 features:
   - |
-    Adds support for 'timeout' parameter when powering on/off an Ironic node
-    that is being managed using 'oneview' hardware type.
+    Adds support for ``timeout`` parameter when powering on/off a bare metal
+    node managed by the ``oneview`` hardware type.
diff --git a/releasenotes/notes/oneview-validations-f6d702d1fab77f91.yaml b/releasenotes/notes/oneview-validations-f6d702d1fab77f91.yaml
deleted file mode 100644
index 58b712850..000000000
--- a/releasenotes/notes/oneview-validations-f6d702d1fab77f91.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-other:
-  - |
-    Adds the implementation of the validations for the OneView hardware type,
-    migrating from python-oneviewclient library to OneView driver. This process
-    is part of migrating from ``python-oneviewclient`` to ``python-hpOneView``
-    and ``python-ilorest-library``.
diff --git a/releasenotes/notes/reboot-do-not-power-off-if-already-1452256167d40009.yaml b/releasenotes/notes/reboot-do-not-power-off-if-already-1452256167d40009.yaml
index 2b6f60d45..f302e9287 100644
--- a/releasenotes/notes/reboot-do-not-power-off-if-already-1452256167d40009.yaml
+++ b/releasenotes/notes/reboot-do-not-power-off-if-already-1452256167d40009.yaml
@@ -1,9 +1,8 @@
 ---
 fixes:
   - |
-    Fixes a problem when using ipmitool and rebooting a node which would cause
-    a deploy to fail. Now when rebooting a node we check if the node is already
-    powered off, if it is we don't attempt to power off the node. This is
-    because some BMCs will error if the node is already powered off and an
-    ipmitool request is made to power it off. See
-    https://bugs.launchpad.net/ironic/+bug/1718794 for details.
+    Fixes a problem when rebooting a node using the ``ipmitool`` power
+    interface could cause a deploy to fail. Now it no longer tries to power off
+    nodes that are already off, because some BMCs will error in these cases.
+    See `bug 1718794 <https://bugs.launchpad.net/ironic/+bug/1718794>`_
+    for details.
diff --git a/releasenotes/notes/rebuild-configdrive-f52479fd55b0f5ce.yaml b/releasenotes/notes/rebuild-configdrive-f52479fd55b0f5ce.yaml
index 45c671f1c..d8e3c03f6 100644
--- a/releasenotes/notes/rebuild-configdrive-f52479fd55b0f5ce.yaml
+++ b/releasenotes/notes/rebuild-configdrive-f52479fd55b0f5ce.yaml
@@ -1,10 +1,11 @@
 ---
 features:
   - |
-    Starting with REST API version 1.35, it is possible to provide
+    Starting with the Bare Metal API version 1.35, it is possible to provide
     a configdrive when rebuilding a node.
 fixes:
   - |
     Fixes the problem of an old configdrive (used for deploying the node)
-    being used again when rebuilding the node. Starting with REST API 1.35,
-    it is possible to specify a different configdrive when rebuilding a node.
+    being used again when rebuilding the node. Starting with the Bare Metal API
+    version 1.35, it is possible to specify a different configdrive when
+    rebuilding a node.
diff --git a/releasenotes/notes/remove-python-oneviewclient-f47e22322f7d151f.yaml b/releasenotes/notes/remove-python-oneviewclient-f47e22322f7d151f.yaml
index 81585ffec..468299e9e 100644
--- a/releasenotes/notes/remove-python-oneviewclient-f47e22322f7d151f.yaml
+++ b/releasenotes/notes/remove-python-oneviewclient-f47e22322f7d151f.yaml
@@ -1,6 +1,6 @@
 ---
-other:
+upgrade:
   - |
-    The OneView drivers no longer use ``python-oneviewclient`` to communicate with
-    OneView appliances. The ``oneview`` hardware type now uses the ``hpOneView``
-    and ``python-ilorest-library`` libraries.
+    The ``oneview`` drivers now use ``hpOneView`` and
+    ``python-ilorest-library`` libraries to communicate with OneView
+    appliances. The ``python-oneviewclient`` library is no longer used.
diff --git a/releasenotes/notes/update-ilorest-library-oneview-132c93ac7014d254.yaml b/releasenotes/notes/update-ilorest-library-oneview-132c93ac7014d254.yaml
deleted file mode 100644
index 92e796dda..000000000
--- a/releasenotes/notes/update-ilorest-library-oneview-132c93ac7014d254.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-upgrade:
-  - |
-    The minimum required version of python-ilorest-library for the hardware
-    type OneView was bumped to 2.1.0.
diff --git a/releasenotes/notes/use-dhcp-option-numbers-8b0b0efae912ff5f.yaml b/releasenotes/notes/use-dhcp-option-numbers-8b0b0efae912ff5f.yaml
index 167d83463..3efbbc57d 100644
--- a/releasenotes/notes/use-dhcp-option-numbers-8b0b0efae912ff5f.yaml
+++ b/releasenotes/notes/use-dhcp-option-numbers-8b0b0efae912ff5f.yaml
@@ -4,4 +4,4 @@ fixes:
     Uses standard DHCP option codes instead of dnsmasq-specific option names,
     because different backends use different option names. This fixes the
     `compatibility issues with neutron's DHCP backends
-    <https://bugs.launchpad.net/ironic/+bug/1717236>`.
+    <https://bugs.launchpad.net/ironic/+bug/1717236>`_.