api-ref: Move the evacuate action to admin action

The evacuate action can be performed by administrators only by default.
But there is the description of the evacuate action in
the "Servers - run an action (servers, action)" section.

It should be in the "Servers - run an administrative action
(servers, action)" section.
So move to the description of the evacuate action
into the administrative action section.

Change-Id: Iafdd77c14c702af24dbb3f5a3adecc45b3014c48
Closes-Bug: #1796054
This commit is contained in:
Takashi NATSUME 2018-10-04 19:00:00 +09:00
parent 85b36cd2f8
commit cfaf8e571f
3 changed files with 4 additions and 4 deletions

@ -16,13 +16,13 @@ the `API guide <http://developer.openstack.org/api-guide/compute/index.html>`_.
.. include:: servers.inc .. include:: servers.inc
.. include:: servers-actions.inc .. include:: servers-actions.inc
.. include:: servers-action-fixed-ip.inc .. include:: servers-action-fixed-ip.inc
.. include:: servers-action-evacuate.inc
.. include:: servers-action-deferred-delete.inc .. include:: servers-action-deferred-delete.inc
.. include:: servers-action-console-output.inc .. include:: servers-action-console-output.inc
.. include:: servers-action-shelve.inc .. include:: servers-action-shelve.inc
.. include:: servers-action-crash-dump.inc .. include:: servers-action-crash-dump.inc
.. include:: servers-action-remote-consoles.inc .. include:: servers-action-remote-consoles.inc
.. include:: servers-admin-action.inc .. include:: servers-admin-action.inc
.. include:: servers-action-evacuate.inc
.. include:: servers-remote-consoles.inc .. include:: servers-remote-consoles.inc
.. include:: server-security-groups.inc .. include:: server-security-groups.inc
.. include:: diagnostics.inc .. include:: diagnostics.inc

@ -13,8 +13,7 @@ or disassociate a fixed or floating IP address from a server.
You can attach a volume to a server. You can attach a volume to a server.
You can create an image from a server, create a backup of a server, You can create an image from a server, create a backup of a server,
evacuate a server from a failed host to a new host, and force-delete a and force-delete a server before deferred cleanup.
server before deferred cleanup.
You can lock, pause, reboot, rebuild, rescue, resize, resume, confirm You can lock, pause, reboot, rebuild, rescue, resize, resume, confirm
the resize of, revert a pending resize for, shelve, shelf-offload, the resize of, revert a pending resize for, shelve, shelf-offload,
unshelve, start, stop, unlock, unpause, and unrescue a server. You can unshelve, start, stop, unlock, unpause, and unrescue a server. You can

@ -8,7 +8,8 @@ Enables administrators to perform an action on a server. Specify the
action in the request body. action in the request body.
You can inject network information into, migrate, live-migrate, You can inject network information into, migrate, live-migrate,
reset networking on, and reset the state of a server. reset networking on, reset the state of a server,
and evacuate a server from a failed host to a new host.
Inject Network Information (injectNetworkInfo Action) Inject Network Information (injectNetworkInfo Action)