summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-11-14 03:08:11 +0000
committerGerrit Code Review <review@openstack.org>2019-11-14 03:08:11 +0000
commitbd0eab8ff56c3e22bd43f92ea002a119812cdf04 (patch)
treef84855d01bca952471e94f8200f872ba50552919
parent9ff7969fbe6b37b4f5d134b4d4ffdda94ab0a508 (diff)
parent3badb674f6604d3beca4ba557939d4fbc07f6178 (diff)
downloadnova-bd0eab8ff56c3e22bd43f92ea002a119812cdf04.tar.gz
Merge ""SUSPENDED" description changed in server_concepts guide and API REF"
-rw-r--r--api-guide/source/server_concepts.rst12
-rw-r--r--api-ref/source/servers.inc14
2 files changed, 13 insertions, 13 deletions
diff --git a/api-guide/source/server_concepts.rst b/api-guide/source/server_concepts.rst
index f96614011b..8155126860 100644
--- a/api-guide/source/server_concepts.rst
+++ b/api-guide/source/server_concepts.rst
@@ -70,12 +70,12 @@ server status is one of the following values:
- ``SUSPENDED``: The server is suspended, either by request or
necessity. This status appears for only the following hypervisors:
- XenServer/XCP, KVM, and ESXi. Administrative users may suspend a
- server if it is infrequently used or to perform system maintenance.
- When you suspend a server, its state is stored on disk, all
- memory is written to disk, and the server is stopped.
- Suspending a server is similar to placing a device in hibernation;
- memory and vCPUs become available to create other servers.
+ XenServer/XCP, KVM, and ESXi. When you suspend a server, its state is stored
+ on disk, all memory is written to disk, and the server is stopped.
+ Suspending a server is similar to placing a device in hibernation and its
+ occupied resource will not be freed but rather kept for when the server is
+ resumed. If an instance is infrequently used and the occupied resource needs
+ to be freed to create other servers, it should be shelved.
- ``UNKNOWN``: The state of the server is unknown. It could be because a part
of the infrastructure is temporarily down (see :doc:`down_cells`
diff --git a/api-ref/source/servers.inc b/api-ref/source/servers.inc
index 8921e93eb7..742a4ad6e1 100644
--- a/api-ref/source/servers.inc
+++ b/api-ref/source/servers.inc
@@ -139,13 +139,13 @@ body. The possible server status values are:
- ``SOFT_DELETED``. The server is marked as deleted but the disk
images are still available to restore.
- ``SUSPENDED``. The server is suspended, either by request or
- necessity. This status appears for only the XenServer/XCP, KVM, and
- ESXi hypervisors. Administrative users can suspend an instance if it
- is infrequently used or to perform system maintenance. When you
- suspend an instance, its VM state is stored on disk, all memory is
- written to disk, and the virtual machine is stopped. Suspending an
- instance is similar to placing a device in hibernation; memory and
- vCPUs become available to create other instances.
+ necessity. This status appears for only the following hypervisors:
+ XenServer/XCP, KVM, and ESXi. When you suspend a server, its state is stored
+ on disk, all memory is written to disk, and the server is stopped.
+ Suspending a server is similar to placing a device in hibernation and its
+ occupied resource will not be freed but rather kept for when the server is
+ resumed. If a server is infrequently used and the occupied resource needs
+ to be freed to create other servers, it should be shelved.
- ``UNKNOWN``. The state of the server is unknown. Contact your cloud
provider.
- ``VERIFY_RESIZE``. System is awaiting confirmation that the server