x
/
openstack-resource-agents
Code Issues Proposed changes

Merge "NovaEvacuate: Add domain parameter"

This commit is contained in:
Jenkins 2016-02-15 14:30:07 +00:00 committed by Gerrit Code Review
parent 312fd78942 45c6a5780b
commit 29c9e6d0eb
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ocf/NovaEvacuate
View File

@ -84,6 +84,14 @@ Note that with Keystone V3 tenant names are only unique within a domain.
<content type="string" default="" />
</parameter>
<parameter name="domain" unique="0" required="0">
<longdesc lang="en">
DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN
</longdesc>
<shortdesc lang="en">DNS domain</shortdesc>
<content type="string" default="" />
</parameter>
<parameter name="endpoint_type" unique="0" required="0">
<longdesc lang="en">
Nova API location (internal, public or admin URL)
@ -273,6 +281,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"