Merge "Update release table for Train and 4.0.0"

Author: Zuul

README.rst

@@ -16,8 +16,8 @@ OpenStackClient
     :alt: Latest Version
 
 OpenStackClient (aka OSC) is a command-line client for OpenStack that brings
-the command set for Compute, Identity, Image, Object Store and Block Storage
-APIs together in a single shell with a uniform command structure.
+the command set for Compute, Identity, Image, Network, Object Store and Block
+Storage APIs together in a single shell with a uniform command structure.
 
 The primary goal is to provide a unified shell command structure and a common
 language to describe operations in OpenStack.
@@ -100,15 +100,3 @@ The corresponding command-line options look very similar::
 
 If a password is not provided above (in plaintext), you will be interactively
 prompted to provide one securely.
-
-Authentication may also be performed using an already-acquired token
-and a URL pointing directly to the service API that presumably was acquired
-from the Service Catalog::
-
-    export OS_TOKEN=<token>
-    export OS_URL=<url-to-openstack-service>
-
-The corresponding command-line options look very similar::
-
-    --os-token <token>
-    --os-url <url-to-openstack-service>

doc/source/cli/authentication.rst

@@ -67,8 +67,6 @@ by the ``ClientManager`` object.
     is selected based on the existing options.  This is a short-circuit
     evaluation, the first match wins.
 
-    * If ``--os-url`` and ``--os-token`` are both present ``token_endpoint``
-      is selected
     * If ``--os-username`` is supplied ``password`` is selected
     * If ``--os-token`` is supplied ``token`` is selected
     * If no selection has been made by now exit with error

doc/source/index.rst

@@ -55,7 +55,7 @@ Contributing
 
 OpenStackClient utilizes all of the usual OpenStack processes and requirements for
 contributions.  The code is hosted `on OpenStack's Git server`_. `Bug reports`_
-and `blueprints`_ may be submitted to the :code:`python-openstackclient` project
+may be submitted to the :code:`python-openstackclient` Storyboard project
 on `Launchpad`_.  Code may be submitted to the
 :code:`openstack/python-openstackclient` project using `Gerrit`_.
 Developers may also be found in the `IRC channel`_ ``#openstack-sdks``.
@@ -64,7 +64,6 @@ Developers may also be found in the `IRC channel`_ ``#openstack-sdks``.
 .. _Launchpad: https://launchpad.net/python-openstackclient
 .. _Gerrit: http://docs.openstack.org/infra/manual/developers.html#development-workflow
 .. _Bug reports: https://storyboard.openstack.org/#!/project/975
-.. _blueprints: https://blueprints.launchpad.net/python-openstackclient
 .. _PyPi: https://pypi.org/project/python-openstackclient
 .. _tarball: http://tarballs.openstack.org/python-openstackclient
 .. _IRC channel: https://wiki.openstack.org/wiki/IRC

releasenotes/notes/add-server-migrate-with-host-4884a71903c5c8a9.yaml

@@ -1,7 +1,7 @@
 ---
 features:
   - |
-    Added the ability to specify ``--host`` with ``server migrate``
+    Add ``--host`` option to ``server migrate`` command
     (cold migration) to specify the target host of the migration.
     Requires ``--os-compute-api-version`` 2.56 or greater to target a
     specific host for the (cold) migration.

releasenotes/notes/better-ipv6-address-suppport-security-group-rules-95272847349982e5.yaml

@@ -1,9 +1,8 @@
 ---
 features:
   - |
-    Security group rules can now be filtered by Ethertype in
-    ``security group rule list`` using ``--ethertype`` with either
-    ``ipv4`` or ``ipv6`` as an argument.
+    Add ``--ethertype`` option to ``security group rule list`` command.
+    Valid values are ``ipv4`` and ``ipv6``.
 upgrade:
   - |
     Security group rule listings now have the ``Ethertype`` field displayed

releasenotes/notes/bug-1716789-abfae897b7e61246.yaml

@@ -1,17 +1,10 @@
 ---
-features:
+fixes:
   - |
-    Change to use ``any`` as the default ``--protocol`` option to
+    Change the default value of ``--protocol`` option to ``any`` in
     ``security group rule create`` command when using the Neutron v2 API.
     [Bug `1716789 <https://bugs.launchpad.net/bugs/1716789>`_]
-fixes:
-  - |
-    The default protocol used to create a security rule was changed to
-    ``tcp``, which was a regression from the neutron client when using
-    the Neutron v2 API.  Change it back to ``any``, which skips sending
-    the protocol to the API server entirely.
 upgrade:
   - |
-    Users that had been creating rules without specifying a protocol
-    and expecting ``tcp`` need to change to use ``--protocol tcp``
-    explicitly when using the Neutron v2 API.
+    Commands that assumed the default value of ``--protocol`` to be ``tcp``
+    now must include ``--protocol tcp`` explicitly in Network commands.

releasenotes/notes/volume-v3-default-0ffa9bebb43b5057.yaml

@@ -3,5 +3,5 @@ upgrade:
   - |
     Volume commands now default to Volume API 3.  On older clouds
     that do not support Volume 3.x ``--os-volume-api-version 2``
-    of the adition of ``volume_api_version: '2' in ``clouds.yaml``
+    or the adition of ``volume_api_version: '2'`` in ``clouds.yaml``
     will be required.

releasenotes/source/index.rst

@@ -27,6 +27,8 @@ OpenStack release was made is shown below:
 =================  =======================
 OpenStack Release  OpenStackClient Release
 =================  =======================
+Train              4.0.0
+Stein              3.18.0
 Rocky              3.16.0
 Queens             3.14.0
 Pike               3.12.0