diff options
| author | Corey Bryant <corey.bryant@canonical.com> | 2018-02-12 09:30:43 -0500 |
|---|---|---|
| committer | git-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com> | 2018-02-12 20:59:09 +0000 |
| commit | 92fca0b819014f64faf2d08811b3fed9a9a4cd08 (patch) | |
| tree | 0188e2b184bf86c2843fd716cd655ecb2704f8fb /doc/source | |
| parent | ddb85e0812c5c97f8cf9342c6ee47226c1e8cdd2 (diff) | |
3.14.0-0ubuntu1 (patches unapplied)import/3.14.0-0ubuntu1ubuntu/bionic
Imported using git-ubuntu import.
Notes
Notes:
* New upstream release.
* d/control: Align (Build-)Depends with upstream.
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/cli/authentication.rst | 12 | ||||
| -rw-r--r-- | doc/source/cli/command-objects/flavor.rst | 2 | ||||
| -rw-r--r-- | doc/source/cli/command-objects/floating-ip.rst | 21 | ||||
| -rw-r--r-- | doc/source/cli/command-objects/port.rst | 6 |
4 files changed, 33 insertions, 8 deletions
diff --git a/doc/source/cli/authentication.rst b/doc/source/cli/authentication.rst index 43fcd88..b153f54 100644 --- a/doc/source/cli/authentication.rst +++ b/doc/source/cli/authentication.rst @@ -114,22 +114,22 @@ to tell the client in which domain the user and project exists. If using a user name and password to authenticate, specify either it's owning domain name or ID. - * ``--os-user-domain-name`` or ``OS_USER_DOMAIN_NAME`` +* ``--os-user-domain-name`` or ``OS_USER_DOMAIN_NAME`` - * ``--os-user-domain-id`` or ``OS_USER_DOMAIN_ID`` +* ``--os-user-domain-id`` or ``OS_USER_DOMAIN_ID`` If using a project name as authorization scope, specify either it's owning domain name or ID. - * ``--os-project-domain-name`` or ``OS_PROJECT_DOMAIN_NAME`` +* ``--os-project-domain-name`` or ``OS_PROJECT_DOMAIN_NAME`` - * ``--os-project-domain-id`` or ``OS_PROJECT_DOMAIN_ID`` +* ``--os-project-domain-id`` or ``OS_PROJECT_DOMAIN_ID`` If using a domain as authorization scope, set either it's name or ID. - * ``--os-domain-name`` or ``OS_DOMAIN_NAME`` +* ``--os-domain-name`` or ``OS_DOMAIN_NAME`` - * ``--os-domain-id`` or ``OS_DOMAIN_ID`` +* ``--os-domain-id`` or ``OS_DOMAIN_ID`` Note that if the user and project share the same domain, then simply setting ``--os-default-domain`` or ``OS_DEFAULT_DOMAIN`` to the domain ID is sufficient. diff --git a/doc/source/cli/command-objects/flavor.rst b/doc/source/cli/command-objects/flavor.rst index 6feb449..1cbd2df 100644 --- a/doc/source/cli/command-objects/flavor.rst +++ b/doc/source/cli/command-objects/flavor.rst @@ -44,7 +44,7 @@ Create new flavor .. option:: --swap <size-mb> - Swap space size in MB (default 0M) + Additional swap space size in MB (default 0M) .. option:: --vcpus <num-cpu> diff --git a/doc/source/cli/command-objects/floating-ip.rst b/doc/source/cli/command-objects/floating-ip.rst index f2f101d..d9ed230 100644 --- a/doc/source/cli/command-objects/floating-ip.rst +++ b/doc/source/cli/command-objects/floating-ip.rst @@ -18,6 +18,7 @@ Create floating IP [--floating-ip-address <ip-address>] [--fixed-ip-address <ip-address>] [--description <description>] + [--qos-policy <qos-policy>] [--project <project> [--project-domain <project-domain>]] <network> @@ -46,6 +47,12 @@ Create floating IP Set floating IP description *Network version 2 only* +.. option:: --qos-policy <qos-policy> + + QoS policy to attach to the floating IP (name or ID) + + *Network version 2 only* + .. option:: --project <project> Owner's project (name or ID) @@ -154,6 +161,7 @@ Set floating IP properties openstack floating ip set --port <port> [--fixed-ip-address <ip-address>] + [--qos-policy <qos-policy> | --no-qos-policy] <floating-ip> .. option:: --port <port> @@ -164,6 +172,14 @@ Set floating IP properties Fixed IP of the port (required only if port has multiple IPs) +.. option:: --qos-policy <qos-policy> + + Attach QoS policy to the floating IP (name or ID) + +.. option:: --no-qos-policy + + Remove the QoS policy attached to the floating IP + .. _floating_ip_set-floating-ip: .. describe:: <floating-ip> @@ -193,12 +209,17 @@ Unset floating IP Properties openstack floating ip unset --port + --qos-policy <floating-ip> .. option:: --port Disassociate any port associated with the floating IP +.. option:: --qos-policy + + Remove the QoS policy attached to the floating IP + .. _floating_ip_unset-floating-ip: .. describe:: <floating-ip> diff --git a/doc/source/cli/command-objects/port.rst b/doc/source/cli/command-objects/port.rst index cf29bb2..f8e8823 100644 --- a/doc/source/cli/command-objects/port.rst +++ b/doc/source/cli/command-objects/port.rst @@ -170,7 +170,7 @@ List ports openstack port list [--device-owner <device-owner>] - [--router <router> | --server <server>] + [--router <router> | --server <server> | --device-id <device-id>] [--network <network>] [--mac-address <mac-address>] [--fixed-ip subnet=<subnet>,ip-address=<ip-address>] @@ -192,6 +192,10 @@ List ports List only ports attached to this server (name or ID) +.. option:: --device-id <device-id> + + List only ports with the specified device ID + .. option:: --network <network> List only ports attached to this network (name or ID) |