Skip to content

Commit 16aeee4

Browse files
author
Dean Troyer
committed
Cleanup for 3.8.0 release
Release notes and proofreading cleanups. Change-Id: Iddc6a64e6ea3082aa220a2465793e6f7f2aecaa9
1 parent da2a820 commit 16aeee4

5 files changed

Lines changed: 22 additions & 11 deletions

File tree

doc/source/command-objects/network-meter-rule.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,16 @@ Create meter rule
1818
.. code:: bash
1919
2020
openstack network meter rule create
21-
[--project <project> [--project-domain <project-domain>]]
21+
--remote-ip-prefix <remote-ip-prefix>
2222
[--ingress | --egress]
2323
[--exclude | --include]
24-
--remote-ip-prefix <remote-ip-prefix>
24+
[--project <project> [--project-domain <project-domain>]]
2525
<meter>
2626
2727
.. option:: --project <project>
2828
2929
Owner's project (name or ID)
3030
31-
*Network version 2 only*
32-
3331
.. option:: --project-domain <project-domain>
3432
3533
Domain the project belongs to (name of ID).

doc/source/command-objects/server.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,16 @@ Create a new server
117117
118118
.. option:: --image <image>
119119

120-
Create server from this image (name or ID)
120+
Create server boot disk from this image (name or ID)
121121

122122
.. option:: --volume <volume>
123123

124-
Create server from this volume (name or ID)
124+
Create server using this volume as the boot disk (name or ID)
125+
126+
This option automatically creates a block device mapping with a boot
127+
index of 0. On many hypervisors (libvirt/kvm for example) this will
128+
be device ``vda``. Do not create a duplicate mapping using
129+
:option:`--block-device-mapping` for this volume.
125130

126131
.. option:: --flavor <flavor>
127132

openstackclient/compute/v2/server.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,12 +336,15 @@ def get_parser(self, prog_name):
336336
disk_group.add_argument(
337337
'--image',
338338
metavar='<image>',
339-
help=_('Create server from this image (name or ID)'),
339+
help=_('Create server boot disk from this image (name or ID)'),
340340
)
341341
disk_group.add_argument(
342342
'--volume',
343343
metavar='<volume>',
344-
help=_('Create server from this volume (name or ID)'),
344+
help=_(
345+
'Create server using this volume as the boot disk '
346+
'(name or ID)'
347+
),
345348
)
346349
parser.add_argument(
347350
'--flavor',
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
features:
3+
- |
4+
Add meter rules commands for ``network meter rule create``,
5+
``network meter rule delete``, ``network meter rule list``,
6+
and ``network meter rule show``.
7+
[Blueprint :oscbp:`neutron-client-metering`]

releasenotes/notes/support-no-property-in-volume-snapshot-0af3fcb31a3cfc2b.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22
features:
33
- |
44
Add ``--no-property`` option in ``volume snapshot set``.
5-
Supporting ``--no-property`` option will apply user a convenient way to
6-
clean all properties of volume snapshot in a short command.
7-
[ Blueprint `allow-overwrite-set-options <https://blueprints.launchpad.net/python-openstackclient/+spec/allow-overwrite-set-options>` _]
5+
[Blueprint `allow-overwrite-set-options <https://blueprints.launchpad.net/python-openstackclient/+spec/allow-overwrite-set-options>`_]

0 commit comments

Comments
 (0)