summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorjichenjc <jichenjc@cn.ibm.com>2016-02-20 06:32:13 +0800
committerjichenjc <jichenjc@cn.ibm.com>2016-02-23 13:43:37 +0800
commit6902a288f8e403cfa143e5c8946ad39bcb2dc396 (patch)
treec8a87d95314ef551743fe27cc10979e6a25e300f /doc/source
parent43957d602b70ac718f0eab0fa30be5a4f20a5233 (diff)
downloadpython-openstackclient-6902a288f8e403cfa143e5c8946ad39bcb2dc396.tar.gz
[compute] Support restore server
Server in soft-delete state can be restored, add this command. Change-Id: Id9d7246f89ae65273505f36dcb664996534ae986
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/command-objects/server.rst15
-rw-r--r--doc/source/commands.rst2
2 files changed, 16 insertions, 1 deletions
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index d50ad37e..674172f0 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -514,6 +514,21 @@ process for the user: the first is to perform the resize, the second is
to either confirm (verify) success and release the old server, or to declare
a revert to release the new server and restart the old one.
+server restore
+--------------
+
+Restore server(s) from soft-deleted state
+
+.. program:: server restore
+.. code:: bash
+
+ os server restore
+ <server> [<server> ...]
+
+.. describe:: <server>
+
+ Server(s) to restore (name or ID)
+
server resume
-------------
diff --git a/doc/source/commands.rst b/doc/source/commands.rst
index 2195720f..9a24afa3 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -199,7 +199,7 @@ Those actions with an opposite action are noted in parens if applicable.
* ``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
-* ``restore`` - restore a heat stack snapshot
+* ``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
* ``save`` - download an object locally