summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/command-objects/availability-zone.rst3
-rw-r--r--doc/source/command-objects/network.rst7
-rw-r--r--doc/source/command-objects/port.rst4
-rw-r--r--doc/source/command-objects/quota.rst12
-rw-r--r--doc/source/command-objects/router.rst4
-rw-r--r--doc/source/command-objects/security-group-rule.rst3
-rw-r--r--doc/source/command-objects/security-group.rst4
-rw-r--r--doc/source/command-objects/server-group.rst80
-rw-r--r--doc/source/command-objects/subnet-pool.rst42
-rw-r--r--doc/source/command-objects/subnet.rst4
-rw-r--r--doc/source/command-objects/volume-service.rst31
-rw-r--r--doc/source/command-options.rst33
-rw-r--r--doc/source/commands.rst17
-rw-r--r--doc/source/developing.rst4
-rw-r--r--doc/source/specs/ip-availability.rst61
15 files changed, 287 insertions, 22 deletions
diff --git a/doc/source/command-objects/availability-zone.rst b/doc/source/command-objects/availability-zone.rst
index 1f568438..149e1081 100644
--- a/doc/source/command-objects/availability-zone.rst
+++ b/doc/source/command-objects/availability-zone.rst
@@ -2,6 +2,9 @@
availability zone
=================
+An **availability zone** is a logical partition of cloud block storage,
+compute and network services.
+
Block Storage v2, Compute v2, Network v2
availability zone list
diff --git a/doc/source/command-objects/network.rst b/doc/source/command-objects/network.rst
index 5d534c59..91eb2b08 100644
--- a/doc/source/command-objects/network.rst
+++ b/doc/source/command-objects/network.rst
@@ -2,6 +2,13 @@
network
=======
+A **network** is an isolated Layer 2 networking segment. There are two types
+of networks, project and provider networks. Project networks are fully isolated
+and are not shared with other projects. Provider networks map to existing
+physical networks in the data center and provide external network access for
+servers and other resources. Only an OpenStack administrator can create
+provider networks. Networks can be connected via routers.
+
Compute v2, Network v2
network create
diff --git a/doc/source/command-objects/port.rst b/doc/source/command-objects/port.rst
index 36e83082..e4cf2cd2 100644
--- a/doc/source/command-objects/port.rst
+++ b/doc/source/command-objects/port.rst
@@ -2,6 +2,10 @@
port
====
+A **port** is a connection point for attaching a single device, such as the
+NIC of a server, to a network. The port also describes the associated network
+configuration, such as the MAC and IP addresses to be used on that port.
+
Network v2
port create
diff --git a/doc/source/command-objects/quota.rst b/doc/source/command-objects/quota.rst
index 98e6df33..9e09bd48 100644
--- a/doc/source/command-objects/quota.rst
+++ b/doc/source/command-objects/quota.rst
@@ -4,7 +4,7 @@ quota
Resource quotas appear in multiple APIs, OpenStackClient presents them as a single object with multiple properties.
-Compute v2, Block Storage v1
+Block Storage v1, Compute v2, Network v2
quota set
---------
@@ -129,14 +129,14 @@ Set quotas for class
quota show
----------
-Show quotas for project
+Show quotas for project or class
.. program:: quota show
.. code:: bash
os quota show
[--default]
- <project>
+ [<project>]
.. option:: --default
@@ -146,13 +146,13 @@ Show quotas for project
.. _quota_show-project:
.. describe:: <project>
- Show quotas for class
+ Show quotas for this project (name or ID)
.. code:: bash
os quota show
--class
- <class>
+ [<class>]
.. option:: --class
@@ -161,4 +161,4 @@ Show quotas for project
.. _quota_show-class:
.. describe:: <class>
- Class to show
+ Show quotas for this class (name or ID)
diff --git a/doc/source/command-objects/router.rst b/doc/source/command-objects/router.rst
index 1503516e..1bb9341e 100644
--- a/doc/source/command-objects/router.rst
+++ b/doc/source/command-objects/router.rst
@@ -2,6 +2,10 @@
router
======
+A **router** is a logical component that forwards data packets between
+networks. It also provides Layer 3 and NAT forwarding to provide external
+network access for servers on project networks.
+
Network v2
router add port
diff --git a/doc/source/command-objects/security-group-rule.rst b/doc/source/command-objects/security-group-rule.rst
index 8218c81a..b0ac3c94 100644
--- a/doc/source/command-objects/security-group-rule.rst
+++ b/doc/source/command-objects/security-group-rule.rst
@@ -2,6 +2,9 @@
security group rule
===================
+A **security group rule** specifies the network access rules for servers
+and other resources on the network.
+
Compute v2, Network v2
security group rule create
diff --git a/doc/source/command-objects/security-group.rst b/doc/source/command-objects/security-group.rst
index 2c6e7a8a..3af11b5a 100644
--- a/doc/source/command-objects/security-group.rst
+++ b/doc/source/command-objects/security-group.rst
@@ -2,6 +2,10 @@
security group
==============
+A **security group** acts as a virtual firewall for servers and other
+resources on a network. It is a container for security group rules
+which specify the network access rules.
+
Compute v2, Network v2
security group create
diff --git a/doc/source/command-objects/server-group.rst b/doc/source/command-objects/server-group.rst
new file mode 100644
index 00000000..55d789c7
--- /dev/null
+++ b/doc/source/command-objects/server-group.rst
@@ -0,0 +1,80 @@
+============
+server group
+============
+
+Server group provides a mechanism to group servers according to certain policy.
+
+Compute v2
+
+server group create
+-------------------
+
+Create a new server group
+
+.. program:: server group create
+.. code-block:: bash
+
+ os server group create
+ --policy <policy> [--policy <policy>] ...
+ <name>
+
+.. option:: --policy <policy>
+
+ Add a policy to :ref:`\<name\> <server_group_create-name>`
+ (repeat option to add multiple policies)
+
+.. _server_group_create-name:
+.. describe:: <name>
+
+ New server group name
+
+server group delete
+-------------------
+
+Delete an existing server group
+
+.. program:: server group delete
+.. code-block:: bash
+
+ os server group delete
+ <server-group> [<server-group> ...]
+
+.. describe:: <server-group>
+
+ Server group(s) to delete (name or ID)
+ (repeat to delete multiple server groups)
+
+server group list
+-----------------
+
+List all server groups
+
+.. program:: server group list
+.. code-block:: bash
+
+ os server group list
+ [--all-projects]
+ [--long]
+
+.. option:: --all-projects
+
+ Display information from all projects (admin only)
+
+.. option:: --long
+
+ List additional fields in output
+
+server group show
+-----------------
+
+Display server group details
+
+.. program:: server group show
+.. code-block:: bash
+
+ os server group show
+ <server-group>
+
+.. describe:: <server-group>
+
+ Server group to display (name or ID)
diff --git a/doc/source/command-objects/subnet-pool.rst b/doc/source/command-objects/subnet-pool.rst
index 3b7d0e91..8abf25a6 100644
--- a/doc/source/command-objects/subnet-pool.rst
+++ b/doc/source/command-objects/subnet-pool.rst
@@ -2,6 +2,9 @@
subnet pool
===========
+A **subnet pool** contains a collection of prefixes in CIDR notation
+that are available for IP address allocation.
+
Network v2
subnet pool create
@@ -13,19 +16,16 @@ Create subnet pool
.. code:: bash
os subnet pool create
- [--pool-prefix <pool-prefix> [...]]
[--default-prefix-length <default-prefix-length>]
[--min-prefix-length <min-prefix-length>]
[--max-prefix-length <max-prefix-length>]
[--project <project> [--project-domain <project-domain>]]
[--address-scope <address-scope>]
+ [--default | --no-default]
+ [--share | --no-share]
+ --pool-prefix <pool-prefix> [...]
<name>
-.. option:: --pool-prefix <pool-prefix>
-
- Set subnet pool prefixes (in CIDR notation)
- (repeat option to set multiple prefixes)
-
.. option:: --default-prefix-length <default-prefix-length>
Set subnet pool default prefix length
@@ -52,6 +52,27 @@ Create subnet pool
Set address scope associated with the subnet pool (name or ID),
prefixes must be unique across address scopes
+.. option:: --default
+
+ Set this as a default subnet pool
+
+.. option:: --no-default
+
+ Set this as a non-default subnet pool
+
+.. option:: --share
+
+ Set this subnet pool as shared
+
+.. option:: --no-share
+
+ Set this subnet pool as not shared
+
+.. describe:: --pool-prefix <pool-prefix>
+
+ Set subnet pool prefixes (in CIDR notation)
+ (repeat option to set multiple prefixes)
+
.. _subnet_pool_create-name:
.. describe:: <name>
@@ -103,6 +124,7 @@ Set subnet pool properties
[--min-prefix-length <min-prefix-length>]
[--max-prefix-length <max-prefix-length>]
[--address-scope <address-scope> | --no-address-scope]
+ [--default | --no-default]
<subnet-pool>
.. option:: --name <name>
@@ -135,6 +157,14 @@ Set subnet pool properties
Remove address scope associated with the subnet pool
+.. option:: --default
+
+ Set this as a default subnet pool
+
+.. option:: --no-default
+
+ Set this as a non-default subnet pool
+
.. _subnet_pool_set-subnet-pool:
.. describe:: <subnet-pool>
diff --git a/doc/source/command-objects/subnet.rst b/doc/source/command-objects/subnet.rst
index 35134f46..8daa251f 100644
--- a/doc/source/command-objects/subnet.rst
+++ b/doc/source/command-objects/subnet.rst
@@ -2,6 +2,10 @@
subnet
======
+A **subnet** is a block of IP addresses and associated configuration state.
+Subnets are used to allocate IP addresses when new ports are created on a
+network.
+
Network v2
subnet create
diff --git a/doc/source/command-objects/volume-service.rst b/doc/source/command-objects/volume-service.rst
new file mode 100644
index 00000000..aa9fa6d2
--- /dev/null
+++ b/doc/source/command-objects/volume-service.rst
@@ -0,0 +1,31 @@
+==============
+volume service
+==============
+
+Volume v1, v2
+
+volume service list
+-------------------
+
+List volume service
+
+.. program:: volume service list
+.. code:: bash
+
+ os volume service list
+ [--host <host>]
+ [--service <service>]
+ [--long]
+
+.. _volume-service-list:
+.. option:: --host <host>
+
+ List services on specified host (name only)
+
+.. option:: --service <service>
+
+ List only specified service (name only)
+
+.. option:: --long
+
+ List additional fields in output
diff --git a/doc/source/command-options.rst b/doc/source/command-options.rst
index d47a56dc..5cb84684 100644
--- a/doc/source/command-options.rst
+++ b/doc/source/command-options.rst
@@ -112,8 +112,26 @@ Some options can be repeated to build a collection of values for a property.
Adding a value to the collection must be provided via the ``set`` action.
Removing a value from the collection must be provided via an ``unset`` action.
As a convenience, removing all values from the collection may be provided via a
-``--no`` option on the ``set`` and ``unset`` actions. The ``--no`` option must
-be part of a mutually exclusive group with the related property option.
+``--no`` option on the ``set`` and ``unset`` actions. If both ``--no`` option
+and option are specified, the values specified on the command would overwrite
+the collection property instead of appending on the ``set`` action. The
+``--no`` option must be part of a mutually exclusive group with the related
+property option on the ``unset`` action, overwrite case don't exist in
+``unset`` action.
+
+An example behavior for ``set`` action:
+
+Append:
+
+.. code-block:: bash
+
+ object set --example-property xxx
+
+Overwrite:
+
+.. code-block:: bash
+
+ object set --no-example-property --example-property xxx
The example below assumes a property that contains a list of unique values.
However, this example can also be applied to other collections using the
@@ -129,8 +147,7 @@ An example parser declaration for `set` action:
.. code-block:: python
- example_property_group = parser.add_mutually_exclusive_group()
- example_property_group.add_argument(
+ parser.add_argument(
'--example-property',
metavar='<example-property>',
dest='example_property',
@@ -138,7 +155,7 @@ An example parser declaration for `set` action:
help=_('Example property for this <resource> '
'(repeat option to set multiple properties)'),
)
- example_property_group.add_argument(
+ parser.add_argument(
'--no-example-property',
dest='no_example_property',
action='store_true',
@@ -149,10 +166,12 @@ An example handler in `take_action()` for `set` action:
.. code-block:: python
- if parsed_args.example_property:
+ if parsed_args.example_property and parsed_args.no_example_property:
+ kwargs['example_property'] = parsed_args.example_property
+ elif parsed_args.example_property:
kwargs['example_property'] = \
resource_example_property + parsed_args.example_property
- if parsed_args.no_example_property:
+ elif parsed_args.no_example_property:
kwargs['example_property'] = []
An example parser declaration for `unset` action:
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index bccd6cb1..7e6e5589 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -119,6 +119,7 @@ referring to both Compute and Volume quotas.
* ``security group rule``: (**Compute**, **Network**) - the individual rules that define protocol/IP/port access
* ``server``: (**Compute**) virtual machine instance
* ``server dump``: (**Compute**) a dump file of a server created by features like kdump
+* ``server group``: (**Compute**) a grouping of servers
* ``server image``: (**Compute**) saved server disk image
* ``service``: (**Identity**) a cloud service
* ``service provider``: (**Identity**) a resource that consumes assertions from an ``identity provider``
@@ -133,6 +134,7 @@ referring to both Compute and Volume quotas.
* ``volume``: (**Volume**) block volumes
* ``volume qos``: (**Volume**) quality-of-service (QoS) specification for volumes
* ``volume type``: (**Volume**) deployment-specific types of volumes available
+* ``volume service``: (**Volume**) services to manage block storage operations
Plugin Objects
@@ -145,6 +147,17 @@ list check out :doc:`plugin-commands`.
* ``action definition``: (**Workflow Engine (Mistral)**)
* ``action execution``: (**Workflow Engine (Mistral)**)
* ``baremetal``: (**Baremetal (Ironic)**)
+* ``cluster``: (**Clustering (Senlin)**)
+* ``cluster action``: (**Clustering (Senlin)**)
+* ``cluster event``: (**Clustering (Senlin)**)
+* ``cluster members``: (**Clustering (Senlin)**)
+* ``cluster node``: (**Clustering (Senlin)**)
+* ``cluster policy``: (**CLustering (Senlin)**)
+* ``cluster policy binding``: (**Clustering (Senlin)**)
+* ``cluster policy type``: (**Clustering (Senlin)**)
+* ``cluster profile``: (**Clustering (Senlin)**)
+* ``cluster profile type``: (**Clustering (Senlin)**)
+* ``cluster receiver``: (**Clustering (Senlin)**)
* ``congress datasource``: (**Policy (Congress)**)
* ``congress driver``: (**Policy (Congress)**)
* ``congress policy``: (**Policy (Congress)**)
@@ -196,6 +209,7 @@ Those actions with an opposite action are noted in parens if applicable.
the positional arguments appear in the same order
* ``create`` (``delete``) - create a new occurrence of the specified object
* ``delete`` (``create``) - delete specific occurrences of the specified objects
+* ``expand`` (``shrink``) - increase the capacity of a cluster
* ``issue`` (``revoke``) - issue a token
* ``list`` - display summary information about multiple objects
* ``lock`` (``unlock``) - lock one or more servers so that non-admin user won't be able to execute actions
@@ -206,7 +220,7 @@ Those actions with an opposite action are noted in parens if applicable.
* ``rebuild`` - rebuild a server using (most of) the same arguments as in the original create
* ``remove`` (``add``) - remove an object from a group of objects
* ``rescue`` (``unrescue``) - reboot a server in a special rescue mode allowing access to the original disks
-* ``resize`` - change a server's flavor
+* ``resize`` - change a server's flavor or a cluster's capacity
* ``restore`` - restore a heat stack snapshot or restore a server in soft-deleted state
* ``resume`` (``suspend``) - return one or more suspended servers to running state
* ``revoke`` (``issue``) - revoke a token
@@ -214,6 +228,7 @@ Those actions with an opposite action are noted in parens if applicable.
* ``set`` (``unset``) - set a property on the object, formerly called metadata
* ``shelve`` (``unshelve``) - shelve one or more servers
* ``show`` - display detailed information about the specific object
+* ``shrink`` (``expand``) - reduce the capacity of a cluster
* ``start`` (``stop``) - start one or more servers
* ``stop`` (``start``) - stop one or more servers
* ``suspend`` (``resume``) - stop one or more servers and save to disk freeing memory
diff --git a/doc/source/developing.rst b/doc/source/developing.rst
index 9f8e55ca..2ddaeb2c 100644
--- a/doc/source/developing.rst
+++ b/doc/source/developing.rst
@@ -8,9 +8,9 @@ Communication
Meetings
=========
The OpenStackClient team meets regularly on every Thursday. For details
-please refer to the `wiki`_.
+please refer to the `OpenStack IRC meetings`_ page.
-.. _`wiki`: https://wiki.openstack.org/wiki/Meetings/OpenStackClient
+.. _`OpenStack IRC meetings`: http://eavesdrop.openstack.org/#OpenStackClient_Team_Meeting
Testing
-------
diff --git a/doc/source/specs/ip-availability.rst b/doc/source/specs/ip-availability.rst
new file mode 100644
index 00000000..cf0c71ff
--- /dev/null
+++ b/doc/source/specs/ip-availability.rst
@@ -0,0 +1,61 @@
+===============
+ip availability
+===============
+
+Network v2
+
+ip availability list
+--------------------
+
+List IP availability for network
+
+This command retrieves information about IP availability.
+Useful for admins who need a quick way to check the
+IP availability for all associated networks.
+List specifically returns total IP capacity and the
+number of allocated IP addresses from that pool.
+
+.. program:: ip availability list
+.. code:: bash
+
+ os ip availability list
+ [--ip-version {4,6}]
+ [--project <project>]
+
+.. option:: --ip-version {4,6}
+
+ List IP availability for specific version
+ (Default is 4)
+
+.. option:: --project <project>
+
+ List IP availability for specific project
+ (name or ID)
+
+ip availability show
+--------------------
+
+Show network IP availability details
+
+This command retrieves information about IP availability.
+Useful for admins who need a quick way to
+check the IP availability and details for a
+specific network.
+
+This command will return information about
+IP availability for the network as a whole, and
+return availability information for each individual
+subnet within the network as well.
+
+
+.. program:: ip availability show
+.. code:: bash
+
+ os ip availability show
+ <network>
+
+.. _ip_availability_show-network
+.. describe:: <network>
+
+ Show network IP availability for specific
+ network (name or ID)