aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuki Inoguchi <inoguchi.yuki@fujitsu.com>2023-11-07 18:11:16 +0900
committerJake Hunsaker <jacob.r.hunsaker@gmail.com>2023-11-07 12:22:59 -0800
commit52c92373ddc7ad29972ed23782c365d5d3a356bc (patch)
treea9f19879ef27021b22ef9596b89b0729a36a5681
parentca2e2939a18f5333304fcdb8d43c76d6808acfb5 (diff)
downloadsos-52c92373ddc7ad29972ed23782c365d5d3a356bc.tar.gz
[pacemaker] Add "pcs property config" command
Due to the deprecation of the existing "pcs property list", this patch checks the version of pcs and executes "pcs property config" as an alternative." Signed-off-by: Yuki Inoguchi <inoguchi.yuki@fujitsu.com>
-rw-r--r--sos/report/plugins/pacemaker.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/sos/report/plugins/pacemaker.py b/sos/report/plugins/pacemaker.py
index 3e2c8571..cf11e219 100644
--- a/sos/report/plugins/pacemaker.py
+++ b/sos/report/plugins/pacemaker.py
@@ -8,6 +8,7 @@
from sos.report.plugins import (Plugin, RedHatPlugin, DebianPlugin,
UbuntuPlugin, PluginOpt)
+from sos.utilities import parse_version
from datetime import datetime, timedelta
import re
@@ -42,13 +43,23 @@ class Pacemaker(Plugin):
])
def setup_pcs(self):
+ pcs_pkg = self.policy.package_manager.pkg_by_name('pcs')
+ if pcs_pkg is None:
+ return
+
self.add_copy_spec("/var/log/pcsd/pcsd.log")
self.add_cmd_output([
"pcs stonith sbd status --full",
"pcs stonith sbd watchdog list",
"pcs stonith history show",
- "pcs property list --all"
])
+
+ pcs_version = '.'.join(pcs_pkg['version'])
+ if parse_version(pcs_version) > parse_version('0.10.8'):
+ self.add_cmd_output("pcs property config --all")
+ else:
+ self.add_cmd_output("pcs property list --all")
+
self.add_cmd_output("pcs config", tags="pcs_config")
self.add_cmd_output("pcs quorum status", tags="pcs_quorum_status")
self.add_cmd_output("pcs status --full", tags="pcs_status")