summaryrefslogtreecommitdiff
path: root/openstack_dashboard/dashboards
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-05 05:17:15 +0000
committerGerrit Code Review <review@openstack.org>2017-01-05 05:17:15 +0000
commitdcd22840e0befc2dff3d2df68ade977a7090de8d (patch)
tree97e3fd213f85c31d5d6254f326549c2e5c6571a7 /openstack_dashboard/dashboards
parent2694190df40df738eaa090922fc6c56b37aeb8f0 (diff)
parent4c81bc2993c446f187f9e636229e669d5fc974c7 (diff)
downloadhorizon-dcd22840e0befc2dff3d2df68ade977a7090de8d.tar.gz
Merge "Make evacuate target_host not required"
Diffstat (limited to 'openstack_dashboard/dashboards')
-rw-r--r--openstack_dashboard/dashboards/admin/hypervisors/compute/forms.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/compute/forms.py b/openstack_dashboard/dashboards/admin/hypervisors/compute/forms.py
index 7ee234a6f..f4f9de805 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/compute/forms.py
+++ b/openstack_dashboard/dashboards/admin/hypervisors/compute/forms.py
@@ -27,7 +27,9 @@ class EvacuateHostForm(forms.SelfHandlingForm):
attrs={'readonly': 'readonly'}))
target_host = forms.ThemableChoiceField(
label=_("Target Host"),
- help_text=_("Choose a Host to evacuate servers to."))
+ required=False,
+ help_text=_("Choose a Host to evacuate servers to. If not selected, "
+ "the scheduler will auto select target host."))
on_shared_storage = forms.BooleanField(label=_("Shared Storage"),
initial=False, required=False)
@@ -58,8 +60,7 @@ class EvacuateHostForm(forms.SelfHandlingForm):
api.nova.evacuate_host(request, current_host,
target_host, on_shared_storage)
- msg = _('Starting evacuation from %(current)s to %(target)s.') % \
- {'current': current_host, 'target': target_host}
+ msg = _('Starting to evacuate host: %s.') % current_host
messages.success(request, msg)
return True
except Exception: