Merge "Remove wrong description for auto resize confirm"

Author: Zuul

api-guide/source/server_concepts.rst

@@ -466,22 +466,16 @@ Server actions
    flavor, in essence, scaling the server up or down. The original
    server is saved for a period of time to allow rollback if there is a
    problem. All resizes should be tested and explicitly confirmed, at
-   which time the original server is removed. All resizes are
-   automatically confirmed after 24 hours if you do not confirm or
-   revert them.
+   which time the original server is removed. The resized server may be
+   automatically confirmed based on the administrator's configuration of
+   the deployment.
 
    Confirm resize action will delete the old server in the virt layer.
    The spawned server in the virt layer will be used from then on.
    On the contrary, Revert resize action will delete the new server
    spawned in the virt layer and revert all changes. The original server
    will be used from then on.
 
-   Also, there is a periodic task configured by configuration option
-   resize_confirm_window(in seconds), if this value is not 0, nova compute
-   will check whether the server is in resized state longer than
-   value of resize_confirm_window, it will automatically confirm the resize
-   of the server.
-
 -  **Pause**, **Unpause**
 
    You can pause a server by making a pause request. This request stores

doc/source/admin/configuration/resize.rst

@@ -6,7 +6,10 @@ Resize (or Server resize) is the ability to change the flavor of a server, thus
 allowing it to upscale or downscale according to user needs.  For this feature
 to work properly, you might need to configure some underlying virt layers.
 
-.. todo:: This document needs to be updated for other virt drivers, shared
+Virt drivers
+------------
+
+.. todo:: This section needs to be updated for other virt drivers, shared
           storage considerations, etc.
 
 KVM
@@ -26,3 +29,13 @@ XenServer
 To get resize to work with XenServer (and XCP), you need to establish a root
 trust between all hypervisor nodes and provide an ``/image`` mount point to
 your hypervisors dom0.
+
+Automatic confirm
+-----------------
+
+There is a periodic task configured by configuration option
+:oslo.config:option:`resize_confirm_window` (in seconds).
+If this value is not 0, the ``nova-compute`` service will check whether
+servers are in a resized state longer than the value of
+:oslo.config:option:`resize_confirm_window` and if so will automatically
+confirm the resize of the servers.

doc/source/user/resize.rst

@@ -49,6 +49,11 @@ You can now confirm the resize to change the status to ``ACTIVE``:
 
    $ openstack server resize --confirm SERVER
 
+.. note::
+
+  The resized server may be automatically confirmed based on
+  the administrator's configuration of the deployment.
+
 If the resize fails or does not work as expected, you can revert the resize.
 This will revert the instance to the old flavor and change the status to
 ``ACTIVE``: