diff options
Diffstat (limited to 'doc/source/command-objects')
| -rw-r--r-- | doc/source/command-objects/network.rst | 16 | ||||
| -rw-r--r-- | doc/source/command-objects/security-group-rule.rst | 15 | ||||
| -rw-r--r-- | doc/source/command-objects/security-group.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/server-group.rst | 80 |
4 files changed, 112 insertions, 1 deletions
diff --git a/doc/source/command-objects/network.rst b/doc/source/command-objects/network.rst index e2f5eaf0..5d534c59 100644 --- a/doc/source/command-objects/network.rst +++ b/doc/source/command-objects/network.rst @@ -172,6 +172,9 @@ Set network properties [--enable | --disable] [--share | --no-share] [--external [--default | --no-default] | --internal] + [--provider-network-type <provider-network-type>] + [--provider-physical-network <provider-physical-network>] + [--provider-segment <provider-segment>] <network> .. option:: --name <name> @@ -211,6 +214,19 @@ Set network properties Do not use the network as the default external network. +.. option:: --provider-network-type <provider-network-type> + + The physical mechanism by which the virtual network is implemented. + The supported options are: flat, gre, local, vlan, vxlan + +.. option:: --provider-physical-network <provider-physical-network> + + Name of the physical network over which the virtual network is implemented + +.. option:: --provider-segment <provider-segment> + + VLAN ID for VLAN networks or Tunnel ID for GRE/VXLAN networks + .. _network_set-network: .. describe:: <network> diff --git a/doc/source/command-objects/security-group-rule.rst b/doc/source/command-objects/security-group-rule.rst index 2f212e5e..8218c81a 100644 --- a/doc/source/command-objects/security-group-rule.rst +++ b/doc/source/command-objects/security-group-rule.rst @@ -98,8 +98,23 @@ List security group rules .. code:: bash os security group rule list + [--all-projects] + [--long] [<group>] +.. option:: --all-projects + + Display information from all projects (admin only) + + *Network version 2 ignores this option and will always display information* + *for all projects (admin only).* + +.. option:: --long + + List additional fields in output + + *Compute version 2 does not have additional fields to display.* + .. describe:: <group> List all rules in this security group (name or ID) diff --git a/doc/source/command-objects/security-group.rst b/doc/source/command-objects/security-group.rst index 9fc4c987..2c6e7a8a 100644 --- a/doc/source/command-objects/security-group.rst +++ b/doc/source/command-objects/security-group.rst @@ -69,7 +69,7 @@ List security groups Display information from all projects (admin only) *Network version 2 ignores this option and will always display information* - *for all projects.* + *for all projects (admin only).* security group set ------------------ 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) |
