summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-02-18 23:10:53 +0000
committerGerrit Code Review <review@openstack.org>2023-02-18 23:10:53 +0000
commit439c67254859485011e7fd2859051464e570d78b (patch)
tree2801e030beb27e1d8d609a77380e72be4bbd5095
parent6ec6f1462950805d3c5232236eb5da60a1a205b1 (diff)
parent1d707a72fc58103e9cd3b9258cf0fb3958298fad (diff)
downloadnova-439c67254859485011e7fd2859051464e570d78b.tar.gz
Merge "fup: support evacuate target state"
-rw-r--r--doc/api_samples/os-evacuate/v2.95/server-evacuate-find-host-req.json1
-rw-r--r--doc/api_samples/os-evacuate/v2.95/server-evacuate-req.json3
-rw-r--r--nova/api/openstack/compute/rest_api_version_history.rst5
-rw-r--r--nova/exception.py2
4 files changed, 5 insertions, 6 deletions
diff --git a/doc/api_samples/os-evacuate/v2.95/server-evacuate-find-host-req.json b/doc/api_samples/os-evacuate/v2.95/server-evacuate-find-host-req.json
index ae9fb0a67b..8ad929226e 100644
--- a/doc/api_samples/os-evacuate/v2.95/server-evacuate-find-host-req.json
+++ b/doc/api_samples/os-evacuate/v2.95/server-evacuate-find-host-req.json
@@ -1,5 +1,4 @@
{
"evacuate": {
- "targetState": "stopped"
}
}
diff --git a/doc/api_samples/os-evacuate/v2.95/server-evacuate-req.json b/doc/api_samples/os-evacuate/v2.95/server-evacuate-req.json
index a9f809c830..d192892cdc 100644
--- a/doc/api_samples/os-evacuate/v2.95/server-evacuate-req.json
+++ b/doc/api_samples/os-evacuate/v2.95/server-evacuate-req.json
@@ -1,6 +1,5 @@
{
"evacuate": {
- "host": "testHost",
- "targetState": "stopped"
+ "host": "testHost"
}
}
diff --git a/nova/api/openstack/compute/rest_api_version_history.rst b/nova/api/openstack/compute/rest_api_version_history.rst
index b34510be5c..4a922ab0e2 100644
--- a/nova/api/openstack/compute/rest_api_version_history.rst
+++ b/nova/api/openstack/compute/rest_api_version_history.rst
@@ -1243,5 +1243,6 @@ Name (FQDN).
---------------------
Any evacuated instances will be now stopped at destination. This
-requires minimun compute version 27.0.0 (antelope 2023.1). Operators
-can still use previous microversion for older behavior.
+requires minimun nova release 27.0.0, OpenStack release 2023.1
+Antelope. Operators can still use previous microversion for older
+behavior.
diff --git a/nova/exception.py b/nova/exception.py
index f5993e79f8..0c0ffa85a1 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -2517,7 +2517,7 @@ class DuplicateRecord(NovaException):
class NotSupportedComputeForEvacuateV295(NotSupported):
- msg_fmt = _("Starting to microversion 2.95, evacuate API will stop "
+ msg_fmt = _("Starting with microversion 2.95, evacuate API will stop "
"instance on destination. To evacuate before upgrades are "
"complete please use an older microversion. Required version "
"for compute %(expected), current version %(currently)s")