summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-19 22:58:12 +0000
committerGerrit Code Review <review@openstack.org>2018-07-19 22:58:12 +0000
commit8b8f4676816530eb519b065c6bff3eb8938e1aa9 (patch)
tree7ec1dbde188c6b7881334126b6c6de62ab33182c
parent839da6fec02182fa3c6d51460099ac4f7ebb500d (diff)
parentba8b87fc979d500521085eacb35946434fca7a8c (diff)
downloadpython-novaclient-8b8f4676816530eb519b065c6bff3eb8938e1aa9.tar.gz
Merge "Fix inconsistency"
-rw-r--r--doc/source/cli/nova.rst4
-rw-r--r--novaclient/v2/shell.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/cli/nova.rst b/doc/source/cli/nova.rst
index 6f02dcac..55ea49f8 100644
--- a/doc/source/cli/nova.rst
+++ b/doc/source/cli/nova.rst
@@ -218,7 +218,7 @@ nova usage
Evacuate all instances from failed host.
``host-evacuate-live``
- Live migrate all instances of the specified
+ Live migrate all instances off the specified
host to other available hosts.
``host-list``
@@ -1703,7 +1703,7 @@ nova host-evacuate-live
[--max-servers <max_servers>] [--force]
<host>
-Live migrate all instances of the specified host to other available hosts.
+Live migrate all instances off the specified host to other available hosts.
**Positional arguments:**
diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py
index 0b4450bd..4f8b695c 100644
--- a/novaclient/v2/shell.py
+++ b/novaclient/v2/shell.py
@@ -4911,7 +4911,7 @@ def _server_live_migrate(cs, server, args):
default=False,
help=_('live Evacuate host with exact hypervisor hostname match'))
def do_host_evacuate_live(cs, args):
- """Live migrate all instances of the specified host
+ """Live migrate all instances off the specified host
to other available hosts.
"""
response = []