You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
34 lines
1.3 KiB
34 lines
1.3 KiB
From 18572d4e1e84c9d1f293b9a3082190133367154e Mon Sep 17 00:00:00 2001 |
|
From: Ken Gaillot <kgaillot@redhat.com> |
|
Date: Fri, 26 Jan 2018 12:31:09 -0600 |
|
Subject: [PATCH] Fix: tools: crm_master should always work on node attribute |
|
|
|
Before ccbdb2a, crm_master would always set --node, thus ensuring crm_attribute |
|
would treat the value as a node attribute. That commit removed that so that |
|
crm_attribute could determine the local node name properly, but that introduced |
|
an issue where the master value would be set as a cluster property instead of a |
|
node attribute if --lifetime (or --node) was not set explicitly. |
|
|
|
This fixes it by setting the default value of --lifetime explicitly. |
|
--- |
|
tools/crm_master | 4 ++++ |
|
1 file changed, 4 insertions(+) |
|
|
|
diff --git a/tools/crm_master b/tools/crm_master |
|
index 7e31cea..f4a0772 100755 |
|
--- a/tools/crm_master |
|
+++ b/tools/crm_master |
|
@@ -8,6 +8,10 @@ if [ $? != 0 ] ; then echo "crm_master - A convenience wrapper for crm_attribute |
|
# Note the quotes around `$TEMP': they are essential! |
|
eval set -- "$TEMP" |
|
|
|
+# Explicitly set the (usual default) lifetime, so the attribute gets set as a |
|
+# node attribute and not a cluster property. |
|
+options="--lifetime forever" |
|
+ |
|
while true ; do |
|
case "$1" in |
|
-N|--node|-U|--uname) options="$options $1 $2"; shift; shift;; |
|
-- |
|
1.8.3.1 |
|
|
|
|