|
 |
cbf3a6 |
From 340e12c0d457d244d375c2d805e78033c9dbdf78 Mon Sep 17 00:00:00 2001
|
|
|
cbf3a6 |
From: Takashi Kajinami <tkajinam@redhat.com>
|
|
|
cbf3a6 |
Date: Wed, 04 May 2022 23:13:35 +0900
|
|
|
cbf3a6 |
Subject: [PATCH] NovaCompute/Evacuate: Make user/project domain configurable
|
|
|
cbf3a6 |
|
|
|
cbf3a6 |
... so that we can use a user or a project in a non-default keystone
|
|
|
cbf3a6 |
domain.
|
|
|
cbf3a6 |
|
|
|
cbf3a6 |
Change-Id: I6e2175adca08fd97942cb83b8f8094e980b60c9d
|
|
|
cbf3a6 |
---
|
|
|
cbf3a6 |
|
|
|
cbf3a6 |
diff --git a/heartbeat/NovaEvacuate b/heartbeat/NovaEvacuate
|
|
|
cbf3a6 |
index 596f520..4565766 100644
|
|
|
cbf3a6 |
--- a/heartbeat/NovaEvacuate
|
|
|
cbf3a6 |
+++ b/heartbeat/NovaEvacuate
|
|
|
cbf3a6 |
@@ -63,13 +63,29 @@
|
|
|
cbf3a6 |
|
|
|
cbf3a6 |
<parameter name="tenant_name" unique="0" required="1">
|
|
|
cbf3a6 |
<longdesc lang="en">
|
|
|
cbf3a6 |
-Tenant name for connecting to keystone in admin context.
|
|
|
cbf3a6 |
+Tenant(Project) name for connecting to keystone in admin context.
|
|
|
cbf3a6 |
Note that with Keystone V3 tenant names are only unique within a domain.
|
|
|
cbf3a6 |
</longdesc>
|
|
|
cbf3a6 |
<shortdesc lang="en">Tenant name</shortdesc>
|
|
|
cbf3a6 |
<content type="string" default="" />
|
|
|
cbf3a6 |
</parameter>
|
|
|
cbf3a6 |
|
|
|
cbf3a6 |
+<parameter name="user_domain" unique="0" required="0">
|
|
|
cbf3a6 |
+<longdesc lang="en">
|
|
|
cbf3a6 |
+Keystone domain the user belongs to
|
|
|
cbf3a6 |
+</longdesc>
|
|
|
cbf3a6 |
+<shortdesc lang="en">Keystone v3 User Domain</shortdesc>
|
|
|
cbf3a6 |
+<content type="string" default="" />
|
|
|
cbf3a6 |
+</parameter>
|
|
|
cbf3a6 |
+
|
|
|
cbf3a6 |
+<parameter name="project_domain" unique="0" required="0">
|
|
|
cbf3a6 |
+<longdesc lang="en">
|
|
|
cbf3a6 |
+Keystone domain the tenant(project) belongs to
|
|
|
cbf3a6 |
+</longdesc>
|
|
|
cbf3a6 |
+<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
|
|
|
cbf3a6 |
+<content type="string" default="" />
|
|
|
cbf3a6 |
+</parameter>
|
|
|
cbf3a6 |
+
|
|
|
cbf3a6 |
<parameter name="domain" unique="0" required="0">
|
|
|
cbf3a6 |
<longdesc lang="en">
|
|
|
cbf3a6 |
DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN
|
|
|
cbf3a6 |
@@ -319,6 +335,14 @@
|
|
|
cbf3a6 |
|
|
|
cbf3a6 |
fence_options="${fence_options} -t ${OCF_RESKEY_tenant_name}"
|
|
|
cbf3a6 |
|
|
|
cbf3a6 |
+ if [ -n "${OCF_RESKEY_user_domain}" ]; then
|
|
|
cbf3a6 |
+ fence_options="${fence_options} -u ${OCF_RESKEY_user_domain}"
|
|
|
cbf3a6 |
+ fi
|
|
|
cbf3a6 |
+
|
|
|
cbf3a6 |
+ if [ -n "${OCF_RESKEY_project_domain}" ]; then
|
|
|
cbf3a6 |
+ fence_options="${fence_options} -P ${OCF_RESKEY_project_domain}"
|
|
|
cbf3a6 |
+ fi
|
|
|
cbf3a6 |
+
|
|
|
cbf3a6 |
if [ -n "${OCF_RESKEY_domain}" ]; then
|
|
|
cbf3a6 |
fence_options="${fence_options} -d ${OCF_RESKEY_domain}"
|
|
|
cbf3a6 |
fi
|