File pacemaker-tools-avoid-using-deprecated-options.... of Package pacemaker.10804

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-tools-avoid-using-deprecated-options.patch of Package pacemaker.10804

commit 80b3888720f563866b1e5688f724c57081d14001
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Wed Jan 3 12:06:18 2018 -0600

Low: tools: avoid using deprecated options

diff --git a/cts/CTStests.py b/cts/CTStests.py
index 978effdcc..cbb92c6be 100644
--- a/cts/CTStests.py
+++ b/cts/CTStests.py
@@ -1667,7 +1667,7 @@ class Reattach(CTSTest):
         self.is_unsafe = 0 # Handled by canrunnow()
 
     def _is_managed(self, node):
-        is_managed = self.rsh(node, "crm_attribute -t rsc_defaults -n is-managed -Q -G -d true", 1)
+        is_managed = self.rsh(node, "crm_attribute -t rsc_defaults -n is-managed -q -G -d true", 1)
         is_managed = is_managed[:-1] # Strip off the newline
         return is_managed == "true"
 
@@ -2886,7 +2886,7 @@ class RemoteDriver(CTSTest):
             self.fail("Failed to set remote-node attribute. rc:%s output:%s" % (rc, line))
             return
 
-        (rc, line) = self.CM.rsh(node, "crm_attribute -l forever -n testattr -Q -N %s" % (self.remote_node), None)
+        (rc, line) = self.CM.rsh(node, "crm_attribute -l forever -n testattr -q -N %s" % (self.remote_node), None)
         if rc != 0:
             self.fail("Failed to get remote-node attribute")
             return
diff --git a/cts/patterns.py b/cts/patterns.py
index 3094a1310..2f0a7b512 100644
--- a/cts/patterns.py
+++ b/cts/patterns.py
@@ -39,8 +39,8 @@ class BasePatterns(object):
             "MaintenanceModeOn"    : "cibadmin --modify -c --xml-text '<cluster_property_set id=\"cib-bootstrap-options\"><nvpair id=\"cts-maintenance-mode-setting\" name=\"maintenance-mode\" value=\"true\"/></cluster_property_set>'",
             "MaintenanceModeOff"    : "cibadmin --delete --xpath \"//nvpair[@name='maintenance-mode']\"",
 
-            "StandbyCmd"      : "crm_attribute -VQ  -U %s -n standby -l forever -v %s 2>/dev/null",
-            "StandbyQueryCmd" : "crm_attribute -QG -U %s -n standby -l forever -d off 2>/dev/null",
+            "StandbyCmd"      : "crm_attribute -Vq  -U %s -n standby -l forever -v %s 2>/dev/null",
+            "StandbyQueryCmd" : "crm_attribute -qG -U %s -n standby -l forever -d off 2>/dev/null",
         }
         self.search = {
             "Pat:DC_IDLE"      : "crmd.*State transition.*-> S_IDLE",
diff --git a/tools/crm_failcount b/tools/crm_failcount
index 64702c95f..5cf7e0193 100755
--- a/tools/crm_failcount
+++ b/tools/crm_failcount
@@ -82,7 +82,7 @@ query_single_attr() {
 	QSR_TARGET="$1"
 	QSR_ATTR="$2"
 
-	crm_attribute $VERBOSE -Q --query -t status -d 0 \
+	crm_attribute $VERBOSE --quiet --query -t status -d 0 \
 		-N "$QSR_TARGET" -n "$QSR_ATTR"
 }
 
diff --git a/tools/regression.sh b/tools/regression.sh
index cb67e792a..f5937679c 100755
--- a/tools/regression.sh
+++ b/tools/regression.sh
@@ -148,7 +148,7 @@ function test_tools() {
     test_assert 0
 
     desc="Create node attribute"
-    cmd="crm_attribute -n ram -v 1024M -U node1 -t nodes"
+    cmd="crm_attribute -n ram -v 1024M -N node1 -t nodes"
     test_assert 0
 
     desc="Query new node attribute"

Places

File pacemaker-tools-avoid-using-deprecated-options.patch of Package pacemaker.10804

Places