diff options
Diffstat (limited to 'doc/source')
| -rw-r--r-- | doc/source/command-objects/ip-floating.rst | 2 | ||||
| -rw-r--r-- | doc/source/command-objects/server.rst | 40 | ||||
| -rw-r--r-- | doc/source/commands.rst | 1 |
3 files changed, 43 insertions, 0 deletions
diff --git a/doc/source/command-objects/ip-floating.rst b/doc/source/command-objects/ip-floating.rst index 8dd94782..378812d1 100644 --- a/doc/source/command-objects/ip-floating.rst +++ b/doc/source/command-objects/ip-floating.rst @@ -8,6 +8,7 @@ ip floating add --------------- Add floating IP address to server +(Deprecated, please use ``server add floating ip`` instead) .. program:: ip floating add .. code:: bash @@ -92,6 +93,7 @@ ip floating remove ------------------ Remove floating IP address from server +(Deprecated, please use ``server remove floating ip`` instead) .. program:: ip floating remove .. code:: bash diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst index f11355b6..3393e7fb 100644 --- a/doc/source/command-objects/server.rst +++ b/doc/source/command-objects/server.rst @@ -4,6 +4,26 @@ server Compute v2 +server add floating ip +---------------------- + +Add floating IP address to server + +.. program:: server add floating ip +.. code:: bash + + os server add floating ip + <server> + <ip-address> + +.. describe:: <server> + + Server (name or ID) to receive the floating IP address + +.. describe:: <ip-address> + + Floating IP address (IP address only) to assign to server + server add security group ------------------------- @@ -418,6 +438,26 @@ Rebuild server Server (name or ID) +server remove floating ip +------------------------- + +Remove floating IP address from server + +.. program:: server remove floating ip +.. code:: bash + + os server remove floating ip + <server> + <ip-address> + +.. describe:: <server> + + Server (name or ID) to remove the floating IP address from + +.. describe:: <ip-address> + + Floating IP address (IP address only) to remove from server + server remove security group ---------------------------- diff --git a/doc/source/commands.rst b/doc/source/commands.rst index 42268c25..714cd518 100644 --- a/doc/source/commands.rst +++ b/doc/source/commands.rst @@ -91,6 +91,7 @@ referring to both Compute and Volume quotas. * ``extension``: (**Compute**, **Identity**, **Network**, **Volume**) OpenStack server API extensions * ``federation protocol``: (**Identity**) the underlying protocol used while federating identities * ``flavor``: (**Compute**) predefined server configurations: ram, root disk and so on +* ``floating ip``: (**Compute**, **Network**) - a public IP address that can be mapped to a server * ``floating ip pool``: (**Compute**, **Network**) - a pool of public IP addresses * ``group``: (**Identity**) a grouping of users * ``host``: (**Compute**) - the physical computer running compute services |