Browse Source

Merge "NovaEvacuate: Add domain parameter"

Jenkins 3 years ago
parent
commit
29c9e6d0eb
1 changed files with 12 additions and 0 deletions
  1. 12
    0
      ocf/NovaEvacuate

+ 12
- 0
ocf/NovaEvacuate View File

@@ -84,6 +84,14 @@ Note that with Keystone V3 tenant names are only unique within a domain.
84 84
 <content type="string" default="" />
85 85
 </parameter>
86 86
 
87
+<parameter name="domain" unique="0" required="0">
88
+<longdesc lang="en">
89
+DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN
90
+</longdesc>
91
+<shortdesc lang="en">DNS domain</shortdesc>
92
+<content type="string" default="" />
93
+</parameter>
94
+
87 95
 <parameter name="endpoint_type" unique="0" required="0">
88 96
 <longdesc lang="en">
89 97
 Nova API location (internal, public or admin URL)
@@ -273,6 +281,10 @@ evacuate_validate() {
273 281
 
274 282
     fence_options="${fence_options} -t ${OCF_RESKEY_tenant_name}"
275 283
 
284
+    if [ -n "${OCF_RESKEY_domain}" ]; then
285
+	fence_options="${fence_options} -d ${OCF_RESKEY_domain}"
286
+    fi
287
+
276 288
     if [ -n "${OCF_RESKEY_no_shared_storage}" ]; then
277 289
 	if ocf_is_true "${OCF_RESKEY_no_shared_storage}"; then
278 290
 	    fence_options="${fence_options} --no-shared-storage"

Loading…
Cancel
Save