|
 |
e1b3f1 |
From bb5cfa172ca58cd8adcedcaca92bde54d0645661 Mon Sep 17 00:00:00 2001
|
|
|
e1b3f1 |
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
|
e1b3f1 |
Date: Thu, 14 Jul 2022 10:55:19 +0200
|
|
|
e1b3f1 |
Subject: [PATCH] openstack-agents: set domain parameter's default to Default
|
|
|
e1b3f1 |
and fix missing parameter name in ocf_exit_reason
|
|
|
e1b3f1 |
|
|
|
e1b3f1 |
---
|
|
|
e1b3f1 |
heartbeat/openstack-common.sh | 10 +++++++---
|
|
|
e1b3f1 |
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
e1b3f1 |
|
|
|
e1b3f1 |
diff --git a/heartbeat/openstack-common.sh b/heartbeat/openstack-common.sh
|
|
|
e1b3f1 |
index b6eec09c..14d290bd 100644
|
|
|
e1b3f1 |
--- a/heartbeat/openstack-common.sh
|
|
|
e1b3f1 |
+++ b/heartbeat/openstack-common.sh
|
|
|
e1b3f1 |
@@ -1,6 +1,10 @@
|
|
|
e1b3f1 |
+OCF_RESKEY_user_domain_name_default="Default"
|
|
|
e1b3f1 |
+OCF_RESKEY_project_domain_name_default="Default"
|
|
|
e1b3f1 |
OCF_RESKEY_openstackcli_default="/usr/bin/openstack"
|
|
|
e1b3f1 |
OCF_RESKEY_insecure_default="false"
|
|
|
e1b3f1 |
|
|
|
e1b3f1 |
+: ${OCF_RESKEY_user_domain_name=${OCF_RESKEY_user_domain_name_default}}
|
|
|
e1b3f1 |
+: ${OCF_RESKEY_project_domain_name=${OCF_RESKEY_project_domain_name_default}}
|
|
|
e1b3f1 |
: ${OCF_RESKEY_openstackcli=${OCF_RESKEY_openstackcli_default}}
|
|
|
e1b3f1 |
: ${OCF_RESKEY_insecure=${OCF_RESKEY_insecure_default}}
|
|
|
e1b3f1 |
|
|
|
e1b3f1 |
@@ -64,7 +68,7 @@ Keystone Project.
|
|
|
e1b3f1 |
Keystone User Domain Name.
|
|
|
e1b3f1 |
</longdesc>
|
|
|
e1b3f1 |
<shortdesc lang="en">Keystone User Domain Name</shortdesc>
|
|
|
e1b3f1 |
-<content type="string" />
|
|
|
e1b3f1 |
+<content type="string" default="${OCF_RESKEY_user_domain_name_default}" />
|
|
|
e1b3f1 |
</parameter>
|
|
|
e1b3f1 |
|
|
|
e1b3f1 |
<parameter name="project_domain_name" required="0">
|
|
|
e1b3f1 |
@@ -72,7 +76,7 @@ Keystone User Domain Name.
|
|
|
e1b3f1 |
Keystone Project Domain Name.
|
|
|
e1b3f1 |
</longdesc>
|
|
|
e1b3f1 |
<shortdesc lang="en">Keystone Project Domain Name</shortdesc>
|
|
|
e1b3f1 |
-<content type="string" />
|
|
|
e1b3f1 |
+<content type="string" default="${OCF_RESKEY_project_domain_name_default}" />
|
|
|
e1b3f1 |
</parameter>
|
|
|
e1b3f1 |
|
|
|
e1b3f1 |
<parameter name="openstackcli">
|
|
|
e1b3f1 |
@@ -133,7 +137,7 @@ get_config() {
|
|
|
e1b3f1 |
exit $OCF_ERR_CONFIGURED
|
|
|
e1b3f1 |
fi
|
|
|
e1b3f1 |
if [ -z "$OCF_RESKEY_project_domain_name" ]; then
|
|
|
e1b3f1 |
- ocf_exit_reason " not set"
|
|
|
e1b3f1 |
+ ocf_exit_reason "project_domain_name not set"
|
|
|
e1b3f1 |
exit $OCF_ERR_CONFIGURED
|
|
|
e1b3f1 |
fi
|
|
|
e1b3f1 |
|
|
|
e1b3f1 |
--
|
|
|
e1b3f1 |
2.36.1
|
|
|
e1b3f1 |
|