|
 |
07f095 |
From 121ec00c8ea0f2e8b0c6336bd78fcb58b0bd490c Mon Sep 17 00:00:00 2001
|
|
|
07f095 |
From: Andrew Beekhof <andrew@beekhof.net>
|
|
|
07f095 |
Date: Mon, 27 Nov 2017 13:35:18 +1100
|
|
|
07f095 |
Subject: [PATCH] NovaEvacuate: Additional parameters for v3 keywstone
|
|
|
07f095 |
authentication
|
|
|
07f095 |
|
|
|
07f095 |
Change-Id: I22d2733b17e5a6098b66c4644879b2e1255dbff5
|
|
|
07f095 |
---
|
|
|
07f095 |
heartbeat/NovaEvacuate | 26 +++++++++++++++++++++++++-
|
|
|
07f095 |
1 file changed, 25 insertions(+), 1 deletion(-)
|
|
|
07f095 |
|
|
|
07f095 |
diff --git a/heartbeat/NovaEvacuate b/heartbeat/NovaEvacuate
|
|
|
07f095 |
index b6dadce..ba19ca4 100644
|
|
|
07f095 |
--- a/heartbeat/NovaEvacuate
|
|
|
07f095 |
+++ b/heartbeat/NovaEvacuate
|
|
|
07f095 |
@@ -65,7 +65,23 @@ Password for connecting to keystone in admin context
|
|
|
07f095 |
Tenant name for connecting to keystone in admin context.
|
|
|
07f095 |
Note that with Keystone V3 tenant names are only unique within a domain.
|
|
|
07f095 |
</longdesc>
|
|
|
07f095 |
-<shortdesc lang="en">Tenant name</shortdesc>
|
|
|
07f095 |
+<shortdesc lang="en">Keystone v2 Tenant or v3 Project Name</shortdesc>
|
|
|
07f095 |
+<content type="string" default="" />
|
|
|
07f095 |
+</parameter>
|
|
|
07f095 |
+
|
|
|
07f095 |
+<parameter name="user_domain" unique="0" required="1">
|
|
|
07f095 |
+<longdesc lang="en">
|
|
|
07f095 |
+User's domain name. Used when authenticating to Keystone.
|
|
|
07f095 |
+</longdesc>
|
|
|
07f095 |
+<shortdesc lang="en">Keystone v3 User Domain</shortdesc>
|
|
|
07f095 |
+<content type="string" default="" />
|
|
|
07f095 |
+</parameter>
|
|
|
07f095 |
+
|
|
|
07f095 |
+<parameter name="project_domain" unique="0" required="1">
|
|
|
07f095 |
+<longdesc lang="en">
|
|
|
07f095 |
+Domain name containing project. Used when authenticating to Keystone.
|
|
|
07f095 |
+</longdesc>
|
|
|
07f095 |
+<shortdesc lang="en">Keystone v3 Project Domain</shortdesc>
|
|
|
07f095 |
<content type="string" default="" />
|
|
|
07f095 |
</parameter>
|
|
|
07f095 |
|
|
|
07f095 |
@@ -289,6 +305,14 @@ evacuate_validate() {
|
|
|
07f095 |
|
|
|
07f095 |
fence_options="${fence_options} -t ${OCF_RESKEY_tenant_name}"
|
|
|
07f095 |
|
|
|
07f095 |
+ if [ -n "${OCF_RESKEY_user_domain}" ]; then
|
|
|
07f095 |
+ fence_options="${fence_options} -u ${OCF_RESKEY_user_domain}"
|
|
|
07f095 |
+ fi
|
|
|
07f095 |
+
|
|
|
07f095 |
+ if [ -n "${OCF_RESKEY_project_domain}" ]; then
|
|
|
07f095 |
+ fence_options="${fence_options} -P ${OCF_RESKEY_project_domain}"
|
|
|
07f095 |
+ fi
|
|
|
07f095 |
+
|
|
|
07f095 |
if [ -n "${OCF_RESKEY_region_name}" ]; then
|
|
|
07f095 |
fence_options="${fence_options} \
|
|
|
07f095 |
--region-name ${OCF_RESKEY_region_name}"
|