x
/
openstack-resource-agents
Code Issues Proposed changes

NovaCompute/Evacuate: Make user/project domain configurable 

... so that we can use a user or a project in a non-default keystone
domain.

Change-Id: I6e2175adca08fd97942cb83b8f8094e980b60c9d
This commit is contained in:
Takashi Kajinami 2022-05-04 23:13:35 +09:00
parent 8b9c49fd96
commit 340e12c0d4
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ocf/NovaCompute
View File

@ -62,13 +62,29 @@ Password for connecting to keystone in admin context
<parameter name="tenant_name" unique="0" required="1">
<longdesc lang="en">
Tenant name for connecting to keystone in admin context.
Tenant(Project) name for connecting to keystone in admin context.
Note that with Keystone V3 tenant names are only unique within a domain.
</longdesc>
<shortdesc lang="en">Tenant name</shortdesc>
<content type="string" default="" />
</parameter>
<parameter name="user_domain" unique="0" required="0">
<longdesc lang="en">
Keystone domain the user belongs to
</longdesc>
<shortdesc lang="en">Keystone v3 User Domain</shortdesc>
<content type="string" default="" />
</parameter>
<parameter name="project_domain" unique="0" required="0">
<longdesc lang="en">
Keystone domain the tenant(project) belongs to
</longdesc>
<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
<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
@ -286,6 +302,14 @@ nova_validate() {
fence_options="${fence_options} -t ${OCF_RESKEY_tenant_name}"
if [ -n "${OCF_RESKEY_user_domain}" ]; then
fence_options="${fence_options} -u ${OCF_RESKEY_user_domain}"
fi
if [ -n "${OCF_RESKEY_project_domain}" ]; then
fence_options="${fence_options} -P ${OCF_RESKEY_project_domain}"
fi
if [ -n "${OCF_RESKEY_domain}" ]; then
fence_options="${fence_options} -d ${OCF_RESKEY_domain}"
fi

26
ocf/NovaEvacuate
View File

@ -63,13 +63,29 @@ Password for connecting to keystone in admin context
<parameter name="tenant_name" unique="0" required="1">
<longdesc lang="en">
Tenant name for connecting to keystone in admin context.
Tenant(Project) name for connecting to keystone in admin context.
Note that with Keystone V3 tenant names are only unique within a domain.
</longdesc>
<shortdesc lang="en">Tenant name</shortdesc>
<content type="string" default="" />
</parameter>
<parameter name="user_domain" unique="0" required="0">
<longdesc lang="en">
Keystone domain the user belongs to
</longdesc>
<shortdesc lang="en">Keystone v3 User Domain</shortdesc>
<content type="string" default="" />
</parameter>
<parameter name="project_domain" unique="0" required="0">
<longdesc lang="en">
Keystone domain the tenant(project) belongs to
</longdesc>
<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
<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
@ -319,6 +335,14 @@ evacuate_validate() {
fence_options="${fence_options} -t ${OCF_RESKEY_tenant_name}"
if [ -n "${OCF_RESKEY_user_domain}" ]; then
fence_options="${fence_options} -u ${OCF_RESKEY_user_domain}"
fi
if [ -n "${OCF_RESKEY_project_domain}" ]; then
fence_options="${fence_options} -P ${OCF_RESKEY_project_domain}"
fi
if [ -n "${OCF_RESKEY_domain}" ]; then
fence_options="${fence_options} -d ${OCF_RESKEY_domain}"
fi