diff --git a/doc/source/index.rst b/doc/source/index.rst
index bfa16a72e3..fe12b862ea 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -13,6 +13,7 @@ User Documentation
.. toctree::
:maxdepth: 1
+ Manual Page <man/openstack>
command-list
commands
configuration
@@ -22,7 +23,6 @@ User Documentation
interactive
humaninterfaceguide
backwards-incompatible
- man/openstack
Getting Started
---------------
diff --git a/releasenotes/notes/add-port-commands-a3580662721a6312.yaml b/releasenotes/notes/add-port-commands-a3580662721a6312.yaml
index a5a12567da..4a6ea9b6b7 100644
--- a/releasenotes/notes/add-port-commands-a3580662721a6312.yaml
+++ b/releasenotes/notes/add-port-commands-a3580662721a6312.yaml
@@ -1,5 +1,5 @@
---
features:
- |
- Add support for the ``port create``, ``port list`` and ``port set`` commands.
+ Add ``port create``, ``port list`` and ``port set`` commands
[Bug `1519909 <https://bugs.launchpad.net/python-openstackclient/+bug/1519909>`_]
diff --git a/releasenotes/notes/add_volume_type_access-32ba8d4bfb0f5f3d.yaml b/releasenotes/notes/add_volume_type_access-32ba8d4bfb0f5f3d.yaml
deleted file mode 100644
index 69ae6e76f0..0000000000
--- a/releasenotes/notes/add_volume_type_access-32ba8d4bfb0f5f3d.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-features:
- - |
- Added support for setting volume type access to project.
-
- By default, volumes types are public.
- To create a private volume type, user needs to set is_public boolean
- field to false at volume type creation time.
- To control access to a private volume type, user needs to add access
- of a private volume type to project.
-
- So, this feature enables user to add private volume type access to a
- project using below command
-
- ``volume type set --project <project> <volume_type>``.
-
- [Bug 1554889 'https://bugs.launchpad.net/python-openstackclient/+bug/1554889'_]
-
diff --git a/releasenotes/notes/bug-1519502-d534db6c18adef20.yaml b/releasenotes/notes/bug-1519502-d534db6c18adef20.yaml
index 7f089b9884..43317a0181 100644
--- a/releasenotes/notes/bug-1519502-d534db6c18adef20.yaml
+++ b/releasenotes/notes/bug-1519502-d534db6c18adef20.yaml
@@ -1,4 +1,4 @@
---
-features:
- - Command ``ip floating create`` is now available for neutron network.
+upgrade:
+ - The ``ip floating create`` command now uses Network v2 when enabled
[Bug `1519502 <https://bugs.launchpad.net/python-openstackclient/+bug/1519502>`_]
diff --git a/releasenotes/notes/bug-1554877-7f8479791eab45b7.yaml b/releasenotes/notes/bug-1554877-7f8479791eab45b7.yaml
index a5d602633e..b8120fb475 100644
--- a/releasenotes/notes/bug-1554877-7f8479791eab45b7.yaml
+++ b/releasenotes/notes/bug-1554877-7f8479791eab45b7.yaml
@@ -1,14 +1,11 @@
---
features:
- |
- Added ``--image-property`` option to ``volume set`` command
+ Add ``--image-property`` option to ``volume set`` and ``volume unset`` commands
- Image properties are copied from image when volume is created.
- But since a volume is mutable, user sometime wants to update
- image properties for volume.
+ Image properties are copied when a volume is created from an image.
+ The properties are immutable on the image itself but may be updated
+ or removed from the volume created from that image.
- So, this fix enables user to update image properties of volume
- using below command:
- ``volume set --image-property <key=value> <volume>``.
-
- [Bug '1554877 <https://bugs.launchpad.net/python-openstackclient/+bug/1554877>'_]
+ [Bug `1554877 <https://bugs.launchpad.net/python-openstackclient/+bug/1554877>`_]
+ [Bug `1554879 <https://bugs.launchpad.net/python-openstackclient/+bug/1554879>`_]
diff --git a/releasenotes/notes/bug-1554879-118c6007eba8357a.yaml b/releasenotes/notes/bug-1554879-118c6007eba8357a.yaml
deleted file mode 100644
index 3b9ed48782..0000000000
--- a/releasenotes/notes/bug-1554879-118c6007eba8357a.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-features:
- - |
- Added ``--image-property`` option to ``volume unset`` command
-
- Image properties are copied from image when volume is created.
- But since a volume is mutable, user sometime wants to delete
- image properties for volume.
-
- So, this fix enables user to delete image properties of volume
- using below command:
- ``volume unset [--image-property <key>] <volume>``.
-
- [Bug '1554879 <https://bugs.launchpad.net/python-openstackclient/+bug/1554879>'_]
diff --git a/releasenotes/notes/bug-1554889-32ba8d4bfb0f5f3d.yaml b/releasenotes/notes/bug-1554889-32ba8d4bfb0f5f3d.yaml
new file mode 100644
index 0000000000..ab9ae81865
--- /dev/null
+++ b/releasenotes/notes/bug-1554889-32ba8d4bfb0f5f3d.yaml
@@ -0,0 +1,12 @@
+---
+features:
+ - |
+ Add ``--project`` and ``--project-domain`` options to ``volume type set``
+ and ``volume type unset`` commands
+
+ Use the ``--project`` option to restrict a volume type to a specific project.
+ Volume types are public by default, restricted volume types should be made
+ private with the ``--private`` option to the ``volume create`` command.
+
+ [Bug `1554889 <https://bugs.launchpad.net/python-openstackclient/+bug/1554889>`_]
+ [Bug `1554890 <https://bugs.launchpad.net/python-openstackclient/+bug/1554890>`_]
diff --git a/releasenotes/notes/bug-1556929-edd78cded88ecdc9.yaml b/releasenotes/notes/bug-1556929-edd78cded88ecdc9.yaml
index 44f9a4646f..9cfdd48704 100644
--- a/releasenotes/notes/bug-1556929-edd78cded88ecdc9.yaml
+++ b/releasenotes/notes/bug-1556929-edd78cded88ecdc9.yaml
@@ -1,4 +1,4 @@
---
features:
- - Command ``host set`` is now available for compute
+ - Add ``host set`` command
[Bug `1556929 <https://bugs.launchpad.net/python-openstackclient/+bug/1556929>`_]
diff --git a/releasenotes/notes/bug-1559866-733988f5dd5b07bb.yaml b/releasenotes/notes/bug-1559866-733988f5dd5b07bb.yaml
index 26bd9a0334..db30ed73ad 100644
--- a/releasenotes/notes/bug-1559866-733988f5dd5b07bb.yaml
+++ b/releasenotes/notes/bug-1559866-733988f5dd5b07bb.yaml
@@ -1,4 +1,4 @@
---
features:
- - Add ``aggregate unset`` command for compute v2
+ - Add ``aggregate unset`` command
[Bug `1559866 <https://bugs.launchpad.net/python-openstackclient/+bug/1559866>`_]
diff --git a/releasenotes/notes/bug-1565112-e0cea9bfbcab954f.yaml b/releasenotes/notes/bug-1565112-e0cea9bfbcab954f.yaml
index f8976e6372..e813427b4e 100644
--- a/releasenotes/notes/bug-1565112-e0cea9bfbcab954f.yaml
+++ b/releasenotes/notes/bug-1565112-e0cea9bfbcab954f.yaml
@@ -1,6 +1,6 @@
---
features:
- - Add global options ``os-cert`` and --os-key`` to support client
- certificate/key. Environment variables OS_CERT and OS_KEY, as well
+ - Add global options ``os-cert`` and ``--os-key`` to support client
+ certificate/key. Environment variables ``OS_CERT`` and ``OS_KEY``, as well
as the ``cert`` and ``key`` values in clouds.yaml may also be used
[Bug `1565112 <https://bugs.launchpad.net/bugs/1565112>`_]
diff --git a/releasenotes/notes/type_access_remove-a6a55921d2dae48d.yaml b/releasenotes/notes/type_access_remove-a6a55921d2dae48d.yaml
deleted file mode 100644
index 7dfc949bbb..0000000000
--- a/releasenotes/notes/type_access_remove-a6a55921d2dae48d.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-features:
- - |
- Added support for removing volume type access to project.
-
- By default, volumes types are public.
- To create a private volume type the ``--private`` option must be included
- in the ``volume type create`` command.
-
- To control access to a private volume type, user needs to add or remove
- access of a private volume type to project.
-
- This feature enables user to remove private volume type access to a
- project using below command:
-
- ``volume type unset --project <project> <volume_type>``
-
- [Bug 1554890 'https://bugs.launchpad.net/python-openstackclient/+bug/1554890'_]