Merge "[compute] Support restore server"

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 5678e5d1..c54cadb1 100644
--- a/doc/source/commands.rst
+++ b/doc/source/commands.rst
@@ -201,7 +201,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