From 45c6a5780b7d6101a9e4260826811d1c40580f2e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 3 Feb 2016 10:53:14 +0100 Subject: [PATCH] NovaEvacuate: Add domain parameter This matches what we do in NovaCompute, so we can call fence_compute with the same arguments. Change-Id: I279ab942284176596109db92b93e9252ab7e3a81 --- ocf/NovaEvacuate | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ocf/NovaEvacuate b/ocf/NovaEvacuate index 3865cd2..3e803e1 100644 --- a/ocf/NovaEvacuate +++ b/ocf/NovaEvacuate @@ -83,6 +83,14 @@ Note that with Keystone V3 tenant names are only unique within a domain. + + +DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN + +DNS domain + + + Nova API location (internal, public or admin URL) @@ -271,6 +279,10 @@ evacuate_validate() { fence_options="${fence_options} -t ${OCF_RESKEY_tenant_name}" + if [ -n "${OCF_RESKEY_domain}" ]; then + fence_options="${fence_options} -d ${OCF_RESKEY_domain}" + fi + if [ -n "${OCF_RESKEY_no_shared_storage}" ]; then if ocf_is_true "${OCF_RESKEY_no_shared_storage}"; then fence_options="${fence_options} --no-shared-storage"