Hello community, here is the log from the commit of package fence-agents for openSUSE:Factory checked in at 2016-08-29 15:42:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fence-agents (Old) and /work/SRC/openSUSE:Factory/.fence-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fence-agents" Changes: -------- --- /work/SRC/openSUSE:Factory/fence-agents/fence-agents.changes 2016-07-01 10:01:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.fence-agents.new/fence-agents.changes 2016-08-29 15:45:32.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 26 10:52:01 UTC 2016 - kgronl...@suse.com + +- Update to version 4.0.24: + * Improve obtaining status on Cisco UCS devices + * Fix issues with symlink installations + * Fix documentation for fence_scsi and fence_mpath + +------------------------------------------------------------------- Old: ---- fence-agents-4.0.23.tar.gz New: ---- fence-agents-4.0.24.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fence-agents.spec ++++++ --- /var/tmp/diff_new_pack.OuAPXu/_old 2016-08-29 15:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OuAPXu/_new 2016-08-29 15:45:36.000000000 +0200 @@ -22,7 +22,7 @@ Summary: Fence Agents for Pacemaker from RHCS License: GPL-2.0 and LGPL-2.1 Group: Productivity/Clustering/HA -Version: 4.0.23 +Version: 4.0.24 Release: 0 Url: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.gz ++++++ 0001-fence_compute-Create-nova-client-with-API-2.11.patch ++++++ --- /var/tmp/diff_new_pack.OuAPXu/_old 2016-08-29 15:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OuAPXu/_new 2016-08-29 15:45:36.000000000 +0200 @@ -1,4 +1,4 @@ -From e774f32d1cd912de1f208be74faa44c3d0a1df41 Mon Sep 17 00:00:00 2001 +From 16c983a256fd8a245677ab7052d2ff3fd0b4efb0 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vu...@suse.com> Date: Wed, 3 Feb 2016 11:33:32 +0100 Subject: [PATCH 1/9] fence_compute: Create nova client with API 2.11 @@ -9,10 +9,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index b93580b..a4f62dc 100644 +index 0f05c12..f024aa5 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py -@@ -348,7 +348,7 @@ def main(): +@@ -434,7 +434,7 @@ def main(): sys.exit(0) # The first argument is the Nova client version @@ -22,5 +22,5 @@ options["--password"], options["--tenant-name"], -- -2.8.3 +2.9.0 ++++++ 0002-fence_compute-Keep-compatibility-with-python-novacli.patch ++++++ --- /var/tmp/diff_new_pack.OuAPXu/_old 2016-08-29 15:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OuAPXu/_new 2016-08-29 15:45:36.000000000 +0200 @@ -1,4 +1,4 @@ -From 29425375744cc04d85a1e25a839de47593913c87 Mon Sep 17 00:00:00 2001 +From 1abc140ed7fabff1120dc45527f664aeac0dc4f6 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vu...@suse.com> Date: Wed, 23 Mar 2016 11:03:24 +0100 Subject: [PATCH 2/9] fence_compute: Keep compatibility with python-novaclient @@ -9,10 +9,10 @@ 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index a4f62dc..265a347 100644 +index f024aa5..07639cc 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py -@@ -324,7 +324,12 @@ def main(): +@@ -412,7 +412,12 @@ def main(): run_delay(options) try: @@ -26,7 +26,7 @@ except ImportError: fail_usage("nova not found or not accessible") -@@ -347,8 +352,12 @@ def main(): +@@ -433,8 +438,12 @@ def main(): elif options["--action"] in ["monitor", "status"]: sys.exit(0) @@ -42,5 +42,5 @@ options["--password"], options["--tenant-name"], -- -2.8.3 +2.9.0 ++++++ 0003-fence_compute-Only-list-nova-compute-services-when-g.patch ++++++ --- /var/tmp/diff_new_pack.OuAPXu/_old 2016-08-29 15:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OuAPXu/_new 2016-08-29 15:45:36.000000000 +0200 @@ -1,4 +1,4 @@ -From 3cdf6e12ca6af51dcc9ec4bb5bf4d521922e8339 Mon Sep 17 00:00:00 2001 +From 99ef77ee94d43545473281c017dc1a0189a467fe Mon Sep 17 00:00:00 2001 From: Vincent Untz <vu...@suse.com> Date: Thu, 4 Feb 2016 10:02:49 +0100 Subject: [PATCH 3/9] fence_compute: Only list nova-compute services when @@ -10,7 +10,7 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index e3d5061..bb3798b 100644 +index 07639cc..074b78f 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py @@ -34,7 +34,7 @@ def get_power_status(_, options): @@ -23,5 +23,5 @@ logging.debug("Status of %s is %s" % (service.binary, service.state)) if service.binary == "nova-compute": -- -2.8.3 +2.9.0 ++++++ 0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch ++++++ --- /var/tmp/diff_new_pack.OuAPXu/_old 2016-08-29 15:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OuAPXu/_new 2016-08-29 15:45:36.000000000 +0200 @@ -1,4 +1,4 @@ -From 5cf13d5866d0541281c914ab4edf42cd09d5462b Mon Sep 17 00:00:00 2001 +From 610f1aea848e05ae3fc085975aee8fc36a41d4af Mon Sep 17 00:00:00 2001 From: Vincent Untz <vu...@suse.com> Date: Thu, 4 Feb 2016 09:59:43 +0100 Subject: [PATCH 4/9] fence_compute: Don't list hypervisors but nova-compute @@ -15,7 +15,7 @@ 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index bb3798b..f32c795 100644 +index 074b78f..994aeb2 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py @@ -218,23 +218,23 @@ def fix_domain(options): @@ -57,16 +57,16 @@ last_domain = calculated -@@ -255,7 +255,7 @@ def fix_domain(options): +@@ -256,7 +256,7 @@ def fix_domain(options): elif len(domains) == 1: logging.error("Overriding supplied domain '%s' does not match the one calculated from: %s" - % (options["--domain"], hypervisor.hypervisor_hostname)) + % (options["--domain"], service.host)) options["--domain"] = last_domain + return options["--domain"] - elif len(domains) > 1: -@@ -294,9 +294,9 @@ def get_plugs_list(_, options): +@@ -298,9 +298,9 @@ def get_plugs_list(_, options): result = {} if nova: @@ -80,5 +80,5 @@ result[longhost] = ("", None) result[shorthost] = ("", None) -- -2.8.3 +2.9.0 ++++++ 0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch ++++++ --- /var/tmp/diff_new_pack.OuAPXu/_old 2016-08-29 15:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OuAPXu/_new 2016-08-29 15:45:36.000000000 +0200 @@ -1,4 +1,4 @@ -From 8cb524bea4a2e84787bddbcba9e42e9377d0c94c Mon Sep 17 00:00:00 2001 +From 93aab786cb3374b33a44433d845fe587262ee69d Mon Sep 17 00:00:00 2001 From: Vincent Untz <vu...@suse.com> Date: Wed, 29 Jun 2016 09:42:56 +0200 Subject: [PATCH 5/9] fence_compute: Do not override domain if it is already @@ -9,12 +9,12 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index f32c795..b0f3c2e 100644 +index 994aeb2..cb637e2 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py -@@ -253,8 +253,8 @@ def fix_domain(options): - elif len(domains) == 1 and "--domain" not in options: +@@ -254,8 +254,8 @@ def fix_domain(options): options["--domain"] = last_domain + return options["--domain"] - elif len(domains) == 1: - logging.error("Overriding supplied domain '%s' does not match the one calculated from: %s" @@ -22,7 +22,7 @@ + logging.error("Overriding supplied domain '%s' as it does not match the one calculated from: %s" % (options["--domain"], service.host)) options["--domain"] = last_domain - + return options["--domain"] -- -2.8.3 +2.9.0 ++++++ 0006-fence_compute-Fix-use-of-undefined-variable.patch ++++++ --- /var/tmp/diff_new_pack.OuAPXu/_old 2016-08-29 15:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OuAPXu/_new 2016-08-29 15:45:36.000000000 +0200 @@ -1,31 +1,20 @@ -From 12596126400e54fdd6d94073db6eda1e3f456fdb Mon Sep 17 00:00:00 2001 +From 6da3804b866168e23509c6d1f251194c5d205a3c Mon Sep 17 00:00:00 2001 From: Vincent Untz <vu...@suse.com> Date: Wed, 29 Jun 2016 09:43:57 +0200 Subject: [PATCH 6/9] fence_compute: Fix use of undefined variable --- - fence/agents/compute/fence_compute.py | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) + fence/agents/compute/fence_compute.py | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index b0f3c2e..8665e50 100644 +index cb637e2..37f48ee 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py -@@ -263,6 +263,8 @@ def fix_domain(options): - % (options["--domain"], repr(domains))) - sys.exit(1) - -+ return last_domain -+ - def fix_plug_name(options): - if options["--action"] == "list": - return -@@ -270,15 +272,16 @@ def fix_plug_name(options): - if "--plug" not in options: +@@ -275,14 +275,15 @@ def fix_plug_name(options): return -- fix_domain(options) -+ calculated = fix_domain(options) + calculated = fix_domain(options) + + if calculated is None or "--domain" not in options: + # Nothing supplied and nova not available... what to do... nothing @@ -44,5 +33,5 @@ options["--plug"] = short_plug -- -2.8.3 +2.9.0 ++++++ 0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch ++++++ --- /var/tmp/diff_new_pack.OuAPXu/_old 2016-08-29 15:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OuAPXu/_new 2016-08-29 15:45:36.000000000 +0200 @@ -1,4 +1,4 @@ -From 70e2867a472530a03d9d8c3ebb6c98361a692bf9 Mon Sep 17 00:00:00 2001 +From 160e505367c30d1f8ba045fc1b3ab47bf09176ad Mon Sep 17 00:00:00 2001 From: Vincent Untz <vu...@suse.com> Date: Wed, 29 Jun 2016 09:50:12 +0200 Subject: [PATCH 7/9] fence_compute: Fix fix_domain to not return too early @@ -12,7 +12,7 @@ 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index 8665e50..3b0c729 100644 +index 37f48ee..1cb7df4 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py @@ -229,24 +229,20 @@ def fix_domain(options): @@ -44,15 +44,15 @@ if len(domains) == 0 and "--domain" not in options: logging.error("Could not calculate the domain names used by compute nodes in nova") -@@ -255,7 +251,7 @@ def fix_domain(options): +@@ -256,7 +252,7 @@ def fix_domain(options): elif len(domains) == 1 and options["--domain"] != last_domain: logging.error("Overriding supplied domain '%s' as it does not match the one calculated from: %s" - % (options["--domain"], service.host)) + % (options["--domain"], domains[last_domain])) options["--domain"] = last_domain + return options["--domain"] - elif len(domains) > 1: -- -2.8.3 +2.9.0 ++++++ 0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch ++++++ --- /var/tmp/diff_new_pack.OuAPXu/_old 2016-08-29 15:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OuAPXu/_new 2016-08-29 15:45:36.000000000 +0200 @@ -1,4 +1,4 @@ -From 281bb6e1e842f298ff16f1e3cf5994c15d3ad1f3 Mon Sep 17 00:00:00 2001 +From f892771543d67d4b7b354349b390b16418d6c181 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vu...@suse.com> Date: Wed, 29 Jun 2016 09:51:37 +0200 Subject: [PATCH 8/9] fence_compute: Fix fix_plug_name when looking if plug has @@ -11,10 +11,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index 3b0c729..b083660 100644 +index 1cb7df4..dd04e54 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py -@@ -281,8 +281,8 @@ def fix_plug_name(options): +@@ -283,8 +283,8 @@ def fix_plug_name(options): # Ensure any domain is stripped off since nova isn't using FQDN options["--plug"] = short_plug @@ -26,5 +26,5 @@ else: -- -2.8.3 +2.9.0 ++++++ 0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch ++++++ --- /var/tmp/diff_new_pack.OuAPXu/_old 2016-08-29 15:45:36.000000000 +0200 +++ /var/tmp/diff_new_pack.OuAPXu/_new 2016-08-29 15:45:36.000000000 +0200 @@ -1,4 +1,4 @@ -From 832011f2287f1a9f59da727312e38fb9622dc809 Mon Sep 17 00:00:00 2001 +From 2d7e1008a79627a8bab30d400dd6403adcd30e93 Mon Sep 17 00:00:00 2001 From: Vincent Untz <vu...@suse.com> Date: Wed, 3 Feb 2016 13:45:52 +0100 Subject: [PATCH 9/9] fence_compute: Fix disabling force_down on node when @@ -15,7 +15,7 @@ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index e3d5061..98ad177 100644 +index dd04e54..19d4974 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py @@ -160,23 +160,23 @@ def set_power_status(_, options): @@ -57,5 +57,5 @@ # Pretend we're 'on' so that the fencing library doesn't loop forever waiting for the node to boot override_status = "on" -- -2.8.3 +2.9.0 ++++++ fence-agents-4.0.23.tar.gz -> fence-agents-4.0.24.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/fence/agents/Makefile.am new/fence-agents-4.0.24/fence/agents/Makefile.am --- old/fence-agents-4.0.23/fence/agents/Makefile.am 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/fence/agents/Makefile.am 2016-08-22 14:33:58.000000000 +0200 @@ -4,9 +4,9 @@ SRC = $(TARGET:=.py) -CLEAN_TARGET_ADDITIONAL = kdump/fence_kdump_send manual/fence_ack_manual +CLEAN_TARGET_ADDITIONAL = kdump/fence_kdump_send manual/fence_ack_manual */*.o -EXTRA_DIST = $(SRC) manual/fence_ack_manual.in manual/fence_ack_manual.8 +EXTRA_DIST = $(SRC) manual/fence_ack_manual.in manual/fence_ack_manual.8 zvm/fence_zvm_man_page sbin_SCRIPTS = $(TARGET) manual/fence_ack_manual @@ -17,7 +17,7 @@ sbin_PROGRAMS = kdump/fence_kdump zvm/fence_zvm libexec_PROGRAMS = kdump/fence_kdump_send -noinst_HEADERS = kdump/list.h kdump/message.h kdump/options.h kdump/version.h +noinst_HEADERS = kdump/list.h kdump/message.h kdump/options.h kdump/version.h zvm/fence_zvm.h kdump_fence_kdump_SOURCES = kdump/fence_kdump.c kdump_fence_kdump_CFLAGS = -D_GNU_SOURCE -Ikdump @@ -25,13 +25,13 @@ kdump_fence_kdump_send_SOURCES = kdump/fence_kdump_send.c kdump_fence_kdump_send_CFLAGS = -D_GNU_SOURCE -Ikdump -dist_man_MANS = kdump/fence_kdump.8 kdump/fence_kdump_send.8 +dist_man_MANS = kdump/fence_kdump.8 kdump/fence_kdump_send.8 zvm/fence_zvm.8 scsidatadir = $(CLUSTERDATA) scsidata_SCRIPTS = scsi/fence_scsi_check scsi/fence_scsi_check_hardreboot zvm_fence_zvm_SOURCES = zvm/fence_zvm.c -zvm_fence_zvm_CFLAGS = -D_GNU_SOURCE +zvm_fence_zvm_CFLAGS = -D_GNU_SOURCE -Izvm FENCE_TEST_ARGS = \ login=test\n\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/fence/agents/autodetect/fencing.py new/fence-agents-4.0.24/fence/agents/autodetect/fencing.py --- old/fence-agents-4.0.23/fence/agents/autodetect/fencing.py 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/fence/agents/autodetect/fencing.py 2016-08-22 14:33:58.000000000 +0200 @@ -643,7 +643,7 @@ ## add logging to syslog logging.getLogger().addHandler(SyslogLibHandler()) ## add logging to stderr - logging.getLogger().addHandler(logging.StreamHandler(stream=sys.stderr)) + logging.getLogger().addHandler(logging.StreamHandler(sys.stderr)) (acceptable_actions, _) = _get_available_actions(device_opt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/fence/agents/cisco_ucs/fence_cisco_ucs.py new/fence-agents-4.0.24/fence/agents/cisco_ucs/fence_cisco_ucs.py --- old/fence-agents-4.0.23/fence/agents/cisco_ucs/fence_cisco_ucs.py 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/fence/agents/cisco_ucs/fence_cisco_ucs.py 2016-08-22 14:33:58.000000000 +0200 @@ -19,6 +19,7 @@ RE_GET_DN = re.compile(" dn=\"(.*?)\"", re.IGNORECASE) RE_GET_PNDN = re.compile(" pndn=\"(.*?)\"", re.IGNORECASE) RE_GET_DESC = re.compile(" descr=\"(.*?)\"", re.IGNORECASE) +RE_GET_OPERPOWER = re.compile(" operPower=\"(.*?)\"", re.IGNORECASE) RE_GET_PRESENCE = re.compile(" presence=\"(.*?)\"", re.IGNORECASE) options_global = None @@ -50,12 +51,21 @@ if result == None: fail(EC_STATUS) else: - status = result.group(1) + presence_status = result.group(1) - if status in ["missing", "mismatch"]: + if presence_status in ["missing", "mismatch"]: return "off" else: - return "on" + result = RE_GET_OPERPOWER.search(res) + if result == None: + fail(EC_STATUS) + else: + power_status = result.group(1) + + if power_status == "on": + return "on" + else: + return "off" def set_power_status(conn, options): del conn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/fence/agents/compute/fence_compute.py new/fence-agents-4.0.24/fence/agents/compute/fence_compute.py --- old/fence-agents-4.0.23/fence/agents/compute/fence_compute.py 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/fence/agents/compute/fence_compute.py 2016-08-22 14:33:58.000000000 +0200 @@ -252,17 +252,21 @@ elif len(domains) == 1 and "--domain" not in options: options["--domain"] = last_domain + return options["--domain"] elif len(domains) == 1: logging.error("Overriding supplied domain '%s' does not match the one calculated from: %s" % (options["--domain"], hypervisor.hypervisor_hostname)) options["--domain"] = last_domain + return options["--domain"] elif len(domains) > 1: logging.error("The supplied domain '%s' did not match any used inside nova: %s" % (options["--domain"], repr(domains))) sys.exit(1) + return None + def fix_plug_name(options): if options["--action"] == "list": return @@ -270,7 +274,7 @@ if "--plug" not in options: return - fix_domain(options) + calculated = fix_domain(options) short_plug = options["--plug"].split('.')[0] logging.debug("Checking target '%s' against calculated domain '%s'"% (options["--plug"], calculated)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/fence/agents/eps/fence_eps.py new/fence-agents-4.0.24/fence/agents/eps/fence_eps.py --- old/fence-agents-4.0.23/fence/agents/eps/fence_eps.py 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/fence/agents/eps/fence_eps.py 2016-08-22 14:33:58.000000000 +0200 @@ -11,7 +11,7 @@ from fencing import * from fencing import fail, fail_usage, EC_LOGIN_DENIED, EC_TIMED_OUT, run_delay -if sys.version_info.major > 2: +if sys.version_info[0] > 2: import http.client as httplib else: import httplib diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/fence/agents/lib/XenAPI.py.py new/fence-agents-4.0.24/fence/agents/lib/XenAPI.py.py --- old/fence-agents-4.0.23/fence/agents/lib/XenAPI.py.py 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/fence/agents/lib/XenAPI.py.py 2016-08-22 14:33:58.000000000 +0200 @@ -49,7 +49,7 @@ import socket import logging -if sys.version_info.major > 2: +if sys.version_info[0] > 2: import xmlrpc.client as xmlrpclib import http.client as httplib else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/fence/agents/lib/fencing.py.py new/fence-agents-4.0.24/fence/agents/lib/fencing.py.py --- old/fence-agents-4.0.23/fence/agents/lib/fencing.py.py 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/fence/agents/lib/fencing.py.py 2016-08-22 14:33:58.000000000 +0200 @@ -645,7 +645,7 @@ ## add logging to syslog logging.getLogger().addHandler(SyslogLibHandler()) ## add logging to stderr - logging.getLogger().addHandler(logging.StreamHandler(stream=sys.stderr)) + logging.getLogger().addHandler(logging.StreamHandler(sys.stderr)) (acceptable_actions, _) = _get_available_actions(device_opt) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/fence/agents/mpath/fence_mpath.py new/fence-agents-4.0.24/fence/agents/mpath/fence_mpath.py --- old/fence-agents-4.0.23/fence/agents/mpath/fence_mpath.py 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/fence/agents/mpath/fence_mpath.py 2016-08-22 14:33:58.000000000 +0200 @@ -219,8 +219,8 @@ persistent reservations to control access multipath devices. Underlying \ devices must support SCSI-3 persistent reservations (SPC-3 or greater) as \ well as the \"preempt-and-abort\" subcommand.\nThe fence_mpath agent works by \ -having an unique key for each pair of node and device that has to be set also \ -in /etc/multipath.conf. Once registered, a single node will become the reservation holder \ +having a unique key for each node that has to be set in /etc/multipath.conf. \ +Once registered, a single node will become the reservation holder \ by creating a \"write exclusive, registrants only\" reservation on the \ device(s). The result is that only registered nodes may write to the \ device(s). When a node failure occurs, the fence_mpath agent will remove the \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/fence/agents/pve/fence_pve.py new/fence-agents-4.0.24/fence/agents/pve/fence_pve.py --- old/fence-agents-4.0.23/fence/agents/pve/fence_pve.py 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/fence/agents/pve/fence_pve.py 2016-08-22 14:33:58.000000000 +0200 @@ -13,7 +13,7 @@ sys.path.append("@FENCEAGENTSLIBDIR@") from fencing import fail, EC_LOGIN_DENIED, atexit_handler, all_opt, check_input, process_input, show_docs, fence_action, run_delay -if sys.version_info.major > 2: import urllib.parse as urllib +if sys.version_info[0] > 2: import urllib.parse as urllib else: import urllib #BEGIN_VERSION_GENERATION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/fence/agents/scsi/fence_scsi.py new/fence-agents-4.0.24/fence/agents/scsi/fence_scsi.py --- old/fence-agents-4.0.23/fence/agents/scsi/fence_scsi.py 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/fence/agents/scsi/fence_scsi.py 2016-08-22 14:33:58.000000000 +0200 @@ -438,7 +438,7 @@ devices must support SCSI-3 persistent reservations (SPC-3 or greater) as \ well as the \"preempt-and-abort\" subcommand.\nThe fence_scsi agent works by \ having each node in the cluster register a unique key with the SCSI \ -devive(s). Once registered, a single node will become the reservation holder \ +device(s). Once registered, a single node will become the reservation holder \ by creating a \"write exclusive, registrants only\" reservation on the \ device(s). The result is that only registered nodes may write to the \ device(s). When a node failure occurs, the fence_scsi agent will remove the \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/make/agentpycheck.mk new/fence-agents-4.0.24/make/agentpycheck.mk --- old/fence-agents-4.0.23/make/agentpycheck.mk 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/make/agentpycheck.mk 2016-08-22 14:33:58.000000000 +0200 @@ -1,5 +1,5 @@ DATADIR:=$(abs_top_srcdir)/tests/data/metadata -AWK_VAL='BEGIN {store=-1} /name=\"store_path\"/ {store=2} {if (store!=0) {print}; store--}' +AWK_VAL='BEGIN {store=-1} /name=\".*_path\"/ {store=2} {if (store!=0) {print}; store--}' TEST_TARGET=$(filter-out $(TEST_TARGET_SKIP),$(TARGET)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/make/fencebuild.mk new/fence-agents-4.0.24/make/fencebuild.mk --- old/fence-agents-4.0.23/make/fencebuild.mk 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/make/fencebuild.mk 2016-08-22 14:33:58.000000000 +0200 @@ -1,4 +1,4 @@ -$(TARGET): $(SRC) +define gen_agent_from_py mkdir -p `dirname $@` bash $(top_srcdir)/scripts/fenceparse \ $(top_srcdir)/make/copyright.cf REDHAT_COPYRIGHT \ @@ -35,9 +35,17 @@ else true ; fi for x in `PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/lib $(PYTHON) $(@) -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \ - cp $(@) $(@D)/$$x; \ + cp -f $(@) $(@D)/$$x; \ $(MAKE) $(@D)/$$x.8; \ done +endef + +# dependency, one on one +$(foreach t,$(TARGET),$(eval $(t) : $(t:=.py))) + +# rule +$(TARGET): + $(call gen_agent_from_py) clean: clean-man rm -f $(CLEAN_TARGET:%.8=%) $(CLEAN_TARGET_ADDITIONAL) $(scsidata_SCRIPTS) */*.pyc */*.wiki @@ -47,3 +55,28 @@ fi clean-local: clean + +install-exec-hook: $(TARGET) + if [ -n "$(man8dir)" ]; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + fi + for p in $(TARGET); do \ + dir=`dirname $$p`; \ + for x in `PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/lib $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"`; do \ + echo " $(INSTALL_SCRIPT) $$dir/$$x '$(DESTDIR)$(sbindir)'"; \ + $(INSTALL_SCRIPT) $$dir/$$x "$(DESTDIR)$(sbindir)" || exit $$?; \ + echo " $(INSTALL_DATA) '$$dir/$$x.8' '$(DESTDIR)$(man8dir)'"; \ + $(INSTALL_DATA) "$$dir/$$x.8" "$(DESTDIR)$(man8dir)" || exit $$?; \ + done; \ + done + +uninstall-hook: $(TARGET) + files=`for p in $(TARGET); do \ + for x in \`PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/lib $(PYTHON) $$p -o metadata | grep symlink | sed -e "s/.*\(fence.*\)\" .*/\1/g"\`; do \ + echo " rm -f '$(DESTDIR)$(sbindir)/$$x'"; \ + rm -f "$(DESTDIR)$(sbindir)/$$x"; \ + echo " rm -f '$(DESTDIR)$(man8dir)/$$x.8'"; \ + rm -f "$(DESTDIR)$(man8dir)/$$x.8"; \ + done; \ + done` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/make/fenceman.mk new/fence-agents-4.0.24/make/fenceman.mk --- old/fence-agents-4.0.23/make/fenceman.mk 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/make/fenceman.mk 2016-08-22 14:33:58.000000000 +0200 @@ -1,7 +1,7 @@ -%.8: $(TARGET) $(top_srcdir)/fence/agents/lib/fence2man.xsl +%.8: % $(top_srcdir)/fence/agents/lib/fence2man.xsl set -e && \ PYTHONPATH=$(abs_srcdir)/lib:$(abs_builddir)/../lib:$(abs_builddir)/lib \ - $(PYTHON) $(@:%.8=%) -o metadata > $(@D)/.$(@F).tmp && \ + $(PYTHON) $* -o metadata > $(@D)/.$(@F).tmp && \ xmllint --noout --relaxng $(abs_srcdir)/lib/metadata.rng $(@D)/.$(@F).tmp && \ xsltproc $(top_srcdir)/fence/agents/lib/fence2man.xsl $(@D)/.$(@F).tmp > $@ xsltproc $(top_srcdir)/fence/agents/lib/fence2wiki.xsl $(@D)/.$(@F).tmp | grep -v '<?xml' > $(@D)/$(@F:%.8=%.wiki) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/make/fencemanc.mk new/fence-agents-4.0.24/make/fencemanc.mk --- old/fence-agents-4.0.23/make/fencemanc.mk 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/make/fencemanc.mk 2016-08-22 14:33:58.000000000 +0200 @@ -1,6 +1,6 @@ -%.8: $(TARGET) $(top_srcdir)/fence/agents/lib/fence2man.xsl +%.8: % $(top_srcdir)/fence/agents/lib/fence2man.xsl set -e && \ - ./$(@:%.8=%) -o metadata > $(@D)/.$(@F).tmp && \ + $* -o metadata > $(@D)/.$(@F).tmp && \ xmllint --noout --relaxng $(top_srcdir)/fence/agents/lib/metadata.rng $(@D)/.$(@F).tmp && \ xsltproc $(top_srcdir)/fence/agents/lib/fence2man.xsl $(@D)/.$(@F).tmp > $@ xsltproc $(top_srcdir)/fence/agents/lib/fence2wiki.xsl $(@D)/.$(@F).tmp | grep -v '<?xml' > $(@D)/$(@F:%.8=%.wiki) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_alom.xml new/fence-agents-4.0.24/tests/data/metadata/fence_alom.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_alom.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_alom.xml 2016-08-22 14:33:58.000000000 +0200 @@ -125,7 +125,6 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_amt.xml new/fence-agents-4.0.24/tests/data/metadata/fence_amt.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_amt.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_amt.xml 2016-08-22 14:33:58.000000000 +0200 @@ -84,7 +84,6 @@ </parameter> <parameter name="amttool_path" unique="0" required="0"> <getopt mixed="--amttool-path=[path]" /> - <content type="string" default="/usr/bin/amttool" /> <shortdesc lang="en">Path to amttool binary</shortdesc> </parameter> <parameter name="delay" unique="0" required="0"> @@ -129,7 +128,6 @@ </parameter> <parameter name="sudo_path" unique="0" required="0"> <getopt mixed="--sudo-path=[path]" /> - <content type="string" default="/usr/bin/sudo" /> <shortdesc lang="en">Path to sudo binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_apc.xml new/fence-agents-4.0.24/tests/data/metadata/fence_apc.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_apc.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_apc.xml 2016-08-22 14:33:58.000000000 +0200 @@ -130,12 +130,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_apc_snmp.xml new/fence-agents-4.0.24/tests/data/metadata/fence_apc_snmp.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_apc_snmp.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_apc_snmp.xml 2016-08-22 14:33:58.000000000 +0200 @@ -155,17 +155,14 @@ </parameter> <parameter name="snmpget_path" unique="0" required="0"> <getopt mixed="--snmpget-path=[path]" /> - <content type="string" default="/usr/bin/snmpget" /> <shortdesc lang="en">Path to snmpget binary</shortdesc> </parameter> <parameter name="snmpset_path" unique="0" required="0"> <getopt mixed="--snmpset-path=[path]" /> - <content type="string" default="/usr/bin/snmpset" /> <shortdesc lang="en">Path to snmpset binary</shortdesc> </parameter> <parameter name="snmpwalk_path" unique="0" required="0"> <getopt mixed="--snmpwalk-path=[path]" /> - <content type="string" default="/usr/bin/snmpwalk" /> <shortdesc lang="en">Path to snmpwalk binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_bladecenter.xml new/fence-agents-4.0.24/tests/data/metadata/fence_bladecenter.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_bladecenter.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_bladecenter.xml 2016-08-22 14:33:58.000000000 +0200 @@ -130,12 +130,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_brocade.xml new/fence-agents-4.0.24/tests/data/metadata/fence_brocade.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_brocade.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_brocade.xml 2016-08-22 14:33:58.000000000 +0200 @@ -125,12 +125,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_cisco_mds.xml new/fence-agents-4.0.24/tests/data/metadata/fence_cisco_mds.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_cisco_mds.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_cisco_mds.xml 2016-08-22 14:33:58.000000000 +0200 @@ -154,17 +154,14 @@ </parameter> <parameter name="snmpget_path" unique="0" required="0"> <getopt mixed="--snmpget-path=[path]" /> - <content type="string" default="/usr/bin/snmpget" /> <shortdesc lang="en">Path to snmpget binary</shortdesc> </parameter> <parameter name="snmpset_path" unique="0" required="0"> <getopt mixed="--snmpset-path=[path]" /> - <content type="string" default="/usr/bin/snmpset" /> <shortdesc lang="en">Path to snmpset binary</shortdesc> </parameter> <parameter name="snmpwalk_path" unique="0" required="0"> <getopt mixed="--snmpwalk-path=[path]" /> - <content type="string" default="/usr/bin/snmpwalk" /> <shortdesc lang="en">Path to snmpwalk binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_cisco_ucs.xml new/fence-agents-4.0.24/tests/data/metadata/fence_cisco_ucs.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_cisco_ucs.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_cisco_ucs.xml 2016-08-22 14:33:58.000000000 +0200 @@ -135,7 +135,6 @@ </parameter> <parameter name="gnutlscli_path" unique="0" required="0"> <getopt mixed="--gnutlscli-path=[path]" /> - <content type="string" default="/usr/bin/gnutls-cli" /> <shortdesc lang="en">Path to gnutls-cli binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_docker.xml new/fence-agents-4.0.24/tests/data/metadata/fence_docker.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_docker.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_docker.xml 2016-08-22 14:33:58.000000000 +0200 @@ -133,7 +133,6 @@ </parameter> <parameter name="gnutlscli_path" unique="0" required="0"> <getopt mixed="--gnutlscli-path=[path]" /> - <content type="string" default="/usr/bin/gnutls-cli" /> <shortdesc lang="en">Path to gnutls-cli binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_drac.xml new/fence-agents-4.0.24/tests/data/metadata/fence_drac.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_drac.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_drac.xml 2016-08-22 14:33:58.000000000 +0200 @@ -110,7 +110,6 @@ </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_drac5.xml new/fence-agents-4.0.24/tests/data/metadata/fence_drac5.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_drac5.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_drac5.xml 2016-08-22 14:33:58.000000000 +0200 @@ -134,12 +134,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_eaton_snmp.xml new/fence-agents-4.0.24/tests/data/metadata/fence_eaton_snmp.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_eaton_snmp.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_eaton_snmp.xml 2016-08-22 14:33:58.000000000 +0200 @@ -154,17 +154,14 @@ </parameter> <parameter name="snmpget_path" unique="0" required="0"> <getopt mixed="--snmpget-path=[path]" /> - <content type="string" default="/usr/bin/snmpget" /> <shortdesc lang="en">Path to snmpget binary</shortdesc> </parameter> <parameter name="snmpset_path" unique="0" required="0"> <getopt mixed="--snmpset-path=[path]" /> - <content type="string" default="/usr/bin/snmpset" /> <shortdesc lang="en">Path to snmpset binary</shortdesc> </parameter> <parameter name="snmpwalk_path" unique="0" required="0"> <getopt mixed="--snmpwalk-path=[path]" /> - <content type="string" default="/usr/bin/snmpwalk" /> <shortdesc lang="en">Path to snmpwalk binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_emerson.xml new/fence-agents-4.0.24/tests/data/metadata/fence_emerson.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_emerson.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_emerson.xml 2016-08-22 14:33:58.000000000 +0200 @@ -154,17 +154,14 @@ </parameter> <parameter name="snmpget_path" unique="0" required="0"> <getopt mixed="--snmpget-path=[path]" /> - <content type="string" default="/usr/bin/snmpget" /> <shortdesc lang="en">Path to snmpget binary</shortdesc> </parameter> <parameter name="snmpset_path" unique="0" required="0"> <getopt mixed="--snmpset-path=[path]" /> - <content type="string" default="/usr/bin/snmpset" /> <shortdesc lang="en">Path to snmpset binary</shortdesc> </parameter> <parameter name="snmpwalk_path" unique="0" required="0"> <getopt mixed="--snmpwalk-path=[path]" /> - <content type="string" default="/usr/bin/snmpwalk" /> <shortdesc lang="en">Path to snmpwalk binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_hds_cb.xml new/fence-agents-4.0.24/tests/data/metadata/fence_hds_cb.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_hds_cb.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_hds_cb.xml 2016-08-22 14:33:58.000000000 +0200 @@ -130,12 +130,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_hpblade.xml new/fence-agents-4.0.24/tests/data/metadata/fence_hpblade.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_hpblade.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_hpblade.xml 2016-08-22 14:33:58.000000000 +0200 @@ -130,12 +130,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ibmblade.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ibmblade.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ibmblade.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ibmblade.xml 2016-08-22 14:33:58.000000000 +0200 @@ -154,17 +154,14 @@ </parameter> <parameter name="snmpget_path" unique="0" required="0"> <getopt mixed="--snmpget-path=[path]" /> - <content type="string" default="/usr/bin/snmpget" /> <shortdesc lang="en">Path to snmpget binary</shortdesc> </parameter> <parameter name="snmpset_path" unique="0" required="0"> <getopt mixed="--snmpset-path=[path]" /> - <content type="string" default="/usr/bin/snmpset" /> <shortdesc lang="en">Path to snmpset binary</shortdesc> </parameter> <parameter name="snmpwalk_path" unique="0" required="0"> <getopt mixed="--snmpwalk-path=[path]" /> - <content type="string" default="/usr/bin/snmpwalk" /> <shortdesc lang="en">Path to snmpwalk binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_idrac.xml new/fence-agents-4.0.24/tests/data/metadata/fence_idrac.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_idrac.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_idrac.xml 2016-08-22 14:33:58.000000000 +0200 @@ -116,7 +116,6 @@ </parameter> <parameter name="ipmitool_path" unique="0" required="0"> <getopt mixed="--ipmitool-path=[path]" /> - <content type="string" default="/usr/bin/ipmitool" /> <shortdesc lang="en">Path to ipmitool binary</shortdesc> </parameter> <parameter name="login_timeout" unique="0" required="0"> @@ -156,7 +155,6 @@ </parameter> <parameter name="sudo_path" unique="0" required="0"> <getopt mixed="--sudo-path=[path]" /> - <content type="string" default="/usr/bin/sudo" /> <shortdesc lang="en">Path to sudo binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ifmib.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ifmib.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ifmib.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ifmib.xml 2016-08-22 14:33:58.000000000 +0200 @@ -156,17 +156,14 @@ </parameter> <parameter name="snmpget_path" unique="0" required="0"> <getopt mixed="--snmpget-path=[path]" /> - <content type="string" default="/usr/bin/snmpget" /> <shortdesc lang="en">Path to snmpget binary</shortdesc> </parameter> <parameter name="snmpset_path" unique="0" required="0"> <getopt mixed="--snmpset-path=[path]" /> - <content type="string" default="/usr/bin/snmpset" /> <shortdesc lang="en">Path to snmpset binary</shortdesc> </parameter> <parameter name="snmpwalk_path" unique="0" required="0"> <getopt mixed="--snmpwalk-path=[path]" /> - <content type="string" default="/usr/bin/snmpwalk" /> <shortdesc lang="en">Path to snmpwalk binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ilo.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ilo.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ilo.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ilo.xml 2016-08-22 14:33:58.000000000 +0200 @@ -136,7 +136,6 @@ </parameter> <parameter name="gnutlscli_path" unique="0" required="0"> <getopt mixed="--gnutlscli-path=[path]" /> - <content type="string" default="/usr/bin/gnutls-cli" /> <shortdesc lang="en">Path to gnutls-cli binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ilo2.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ilo2.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ilo2.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ilo2.xml 2016-08-22 14:33:58.000000000 +0200 @@ -136,7 +136,6 @@ </parameter> <parameter name="gnutlscli_path" unique="0" required="0"> <getopt mixed="--gnutlscli-path=[path]" /> - <content type="string" default="/usr/bin/gnutls-cli" /> <shortdesc lang="en">Path to gnutls-cli binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ilo3.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ilo3.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ilo3.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ilo3.xml 2016-08-22 14:33:58.000000000 +0200 @@ -116,7 +116,6 @@ </parameter> <parameter name="ipmitool_path" unique="0" required="0"> <getopt mixed="--ipmitool-path=[path]" /> - <content type="string" default="/usr/bin/ipmitool" /> <shortdesc lang="en">Path to ipmitool binary</shortdesc> </parameter> <parameter name="login_timeout" unique="0" required="0"> @@ -156,7 +155,6 @@ </parameter> <parameter name="sudo_path" unique="0" required="0"> <getopt mixed="--sudo-path=[path]" /> - <content type="string" default="/usr/bin/sudo" /> <shortdesc lang="en">Path to sudo binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ilo3_ssh.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ilo3_ssh.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ilo3_ssh.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ilo3_ssh.xml 2016-08-22 14:33:58.000000000 +0200 @@ -135,12 +135,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ilo4.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ilo4.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ilo4.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ilo4.xml 2016-08-22 14:33:58.000000000 +0200 @@ -116,7 +116,6 @@ </parameter> <parameter name="ipmitool_path" unique="0" required="0"> <getopt mixed="--ipmitool-path=[path]" /> - <content type="string" default="/usr/bin/ipmitool" /> <shortdesc lang="en">Path to ipmitool binary</shortdesc> </parameter> <parameter name="login_timeout" unique="0" required="0"> @@ -156,7 +155,6 @@ </parameter> <parameter name="sudo_path" unique="0" required="0"> <getopt mixed="--sudo-path=[path]" /> - <content type="string" default="/usr/bin/sudo" /> <shortdesc lang="en">Path to sudo binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ilo4_ssh.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ilo4_ssh.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ilo4_ssh.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ilo4_ssh.xml 2016-08-22 14:33:58.000000000 +0200 @@ -135,12 +135,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ilo_moonshot.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ilo_moonshot.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ilo_moonshot.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ilo_moonshot.xml 2016-08-22 14:33:58.000000000 +0200 @@ -125,7 +125,6 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ilo_mp.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ilo_mp.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ilo_mp.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ilo_mp.xml 2016-08-22 14:33:58.000000000 +0200 @@ -125,12 +125,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ilo_ssh.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ilo_ssh.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ilo_ssh.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ilo_ssh.xml 2016-08-22 14:33:58.000000000 +0200 @@ -135,12 +135,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_imm.xml new/fence-agents-4.0.24/tests/data/metadata/fence_imm.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_imm.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_imm.xml 2016-08-22 14:33:58.000000000 +0200 @@ -116,7 +116,6 @@ </parameter> <parameter name="ipmitool_path" unique="0" required="0"> <getopt mixed="--ipmitool-path=[path]" /> - <content type="string" default="/usr/bin/ipmitool" /> <shortdesc lang="en">Path to ipmitool binary</shortdesc> </parameter> <parameter name="login_timeout" unique="0" required="0"> @@ -156,7 +155,6 @@ </parameter> <parameter name="sudo_path" unique="0" required="0"> <getopt mixed="--sudo-path=[path]" /> - <content type="string" default="/usr/bin/sudo" /> <shortdesc lang="en">Path to sudo binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_intelmodular.xml new/fence-agents-4.0.24/tests/data/metadata/fence_intelmodular.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_intelmodular.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_intelmodular.xml 2016-08-22 14:33:58.000000000 +0200 @@ -156,17 +156,14 @@ </parameter> <parameter name="snmpget_path" unique="0" required="0"> <getopt mixed="--snmpget-path=[path]" /> - <content type="string" default="/usr/bin/snmpget" /> <shortdesc lang="en">Path to snmpget binary</shortdesc> </parameter> <parameter name="snmpset_path" unique="0" required="0"> <getopt mixed="--snmpset-path=[path]" /> - <content type="string" default="/usr/bin/snmpset" /> <shortdesc lang="en">Path to snmpset binary</shortdesc> </parameter> <parameter name="snmpwalk_path" unique="0" required="0"> <getopt mixed="--snmpwalk-path=[path]" /> - <content type="string" default="/usr/bin/snmpwalk" /> <shortdesc lang="en">Path to snmpwalk binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ipdu.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ipdu.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ipdu.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ipdu.xml 2016-08-22 14:33:58.000000000 +0200 @@ -154,17 +154,14 @@ </parameter> <parameter name="snmpget_path" unique="0" required="0"> <getopt mixed="--snmpget-path=[path]" /> - <content type="string" default="/usr/bin/snmpget" /> <shortdesc lang="en">Path to snmpget binary</shortdesc> </parameter> <parameter name="snmpset_path" unique="0" required="0"> <getopt mixed="--snmpset-path=[path]" /> - <content type="string" default="/usr/bin/snmpset" /> <shortdesc lang="en">Path to snmpset binary</shortdesc> </parameter> <parameter name="snmpwalk_path" unique="0" required="0"> <getopt mixed="--snmpwalk-path=[path]" /> - <content type="string" default="/usr/bin/snmpwalk" /> <shortdesc lang="en">Path to snmpwalk binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ipmilan.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ipmilan.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ipmilan.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ipmilan.xml 2016-08-22 14:33:58.000000000 +0200 @@ -116,7 +116,6 @@ </parameter> <parameter name="ipmitool_path" unique="0" required="0"> <getopt mixed="--ipmitool-path=[path]" /> - <content type="string" default="/usr/bin/ipmitool" /> <shortdesc lang="en">Path to ipmitool binary</shortdesc> </parameter> <parameter name="login_timeout" unique="0" required="0"> @@ -156,7 +155,6 @@ </parameter> <parameter name="sudo_path" unique="0" required="0"> <getopt mixed="--sudo-path=[path]" /> - <content type="string" default="/usr/bin/sudo" /> <shortdesc lang="en">Path to sudo binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_ldom.xml new/fence-agents-4.0.24/tests/data/metadata/fence_ldom.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_ldom.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_ldom.xml 2016-08-22 14:33:58.000000000 +0200 @@ -127,7 +127,6 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_lpar.xml new/fence-agents-4.0.24/tests/data/metadata/fence_lpar.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_lpar.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_lpar.xml 2016-08-22 14:33:58.000000000 +0200 @@ -138,7 +138,6 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_mpath.xml new/fence-agents-4.0.24/tests/data/metadata/fence_mpath.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_mpath.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_mpath.xml 2016-08-22 14:33:58.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <resource-agent name="fence_mpath" shortdesc="Fence agent for multipath persistent reservation" > <longdesc>fence_mpath is an I/O fencing agent that uses SCSI-3 persistent reservations to control access multipath devices. Underlying devices must support SCSI-3 persistent reservations (SPC-3 or greater) as well as the "preempt-and-abort" subcommand. -The fence_mpath agent works by having an unique key for each pair of node and device that has to be set also in /etc/multipath.conf. Once registered, a single node will become the reservation holder by creating a "write exclusive, registrants only" reservation on the device(s). The result is that only registered nodes may write to the device(s). When a node failure occurs, the fence_mpath agent will remove the key belonging to the failed node from the device(s). The failed node will no longer be able to write to the device(s). A manual reboot is required.</longdesc> +The fence_mpath agent works by having a unique key for each node that has to be set in /etc/multipath.conf. Once registered, a single node will become the reservation holder by creating a "write exclusive, registrants only" reservation on the device(s). The result is that only registered nodes may write to the device(s). When a node failure occurs, the fence_mpath agent will remove the key belonging to the failed node from the device(s). The failed node will no longer be able to write to the device(s). A manual reboot is required.</longdesc> <vendor-url>https://www.sourceware.org/dm/</vendor-url> <parameters> <parameter name="action" unique="0" required="1"> @@ -51,7 +51,6 @@ </parameter> <parameter name="mpathpersist_path" unique="0" required="0"> <getopt mixed="--mpathpersist-path=[path]" /> - <content type="string" default="/usr/sbin/mpathpersist" /> <shortdesc lang="en">Path to mpathpersist binary</shortdesc> </parameter> <parameter name="power_timeout" unique="0" required="0"> @@ -85,7 +84,6 @@ </parameter> <parameter name="sudo_path" unique="0" required="0"> <getopt mixed="--sudo-path=[path]" /> - <content type="string" default="/usr/bin/sudo" /> <shortdesc lang="en">Path to sudo binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_netio.xml new/fence-agents-4.0.24/tests/data/metadata/fence_netio.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_netio.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_netio.xml 2016-08-22 14:33:58.000000000 +0200 @@ -105,7 +105,6 @@ </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_raritan.xml new/fence-agents-4.0.24/tests/data/metadata/fence_raritan.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_raritan.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_raritan.xml 2016-08-22 14:33:58.000000000 +0200 @@ -105,7 +105,6 @@ </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_rhevm.xml new/fence-agents-4.0.24/tests/data/metadata/fence_rhevm.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_rhevm.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_rhevm.xml 2016-08-22 14:33:58.000000000 +0200 @@ -130,7 +130,6 @@ </parameter> <parameter name="gnutlscli_path" unique="0" required="0"> <getopt mixed="--gnutlscli-path=[path]" /> - <content type="string" default="/usr/bin/gnutls-cli" /> <shortdesc lang="en">Path to gnutls-cli binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_rsa.xml new/fence-agents-4.0.24/tests/data/metadata/fence_rsa.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_rsa.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_rsa.xml 2016-08-22 14:33:58.000000000 +0200 @@ -125,12 +125,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_rsb.xml new/fence-agents-4.0.24/tests/data/metadata/fence_rsb.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_rsb.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_rsb.xml 2016-08-22 14:33:58.000000000 +0200 @@ -125,12 +125,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_sanbox2.xml new/fence-agents-4.0.24/tests/data/metadata/fence_sanbox2.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_sanbox2.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_sanbox2.xml 2016-08-22 14:33:58.000000000 +0200 @@ -110,7 +110,6 @@ </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_sbd.xml new/fence-agents-4.0.24/tests/data/metadata/fence_sbd.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_sbd.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_sbd.xml 2016-08-22 14:33:58.000000000 +0200 @@ -73,7 +73,6 @@ </parameter> <parameter name="sbd_path" unique="0" required="0"> <getopt mixed="--sbd-path=[path]" /> - <content type="string" default="/sbin/sbd" /> <shortdesc lang="en">Path to SBD binary</shortdesc> </parameter> <parameter name="shell_timeout" unique="0" required="0"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_scsi.xml new/fence-agents-4.0.24/tests/data/metadata/fence_scsi.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_scsi.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_scsi.xml 2016-08-22 14:33:58.000000000 +0200 @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <resource-agent name="fence_scsi" shortdesc="Fence agent for SCSI persistent reservation" > <longdesc>fence_scsi is an I/O fencing agent that uses SCSI-3 persistent reservations to control access to shared storage devices. These devices must support SCSI-3 persistent reservations (SPC-3 or greater) as well as the "preempt-and-abort" subcommand. -The fence_scsi agent works by having each node in the cluster register a unique key with the SCSI devive(s). Once registered, a single node will become the reservation holder by creating a "write exclusive, registrants only" reservation on the device(s). The result is that only registered nodes may write to the device(s). When a node failure occurs, the fence_scsi agent will remove the key belonging to the failed node from the device(s). The failed node will no longer be able to write to the device(s). A manual reboot is required.</longdesc> +The fence_scsi agent works by having each node in the cluster register a unique key with the SCSI device(s). Once registered, a single node will become the reservation holder by creating a "write exclusive, registrants only" reservation on the device(s). The result is that only registered nodes may write to the device(s). When a node failure occurs, the fence_scsi agent will remove the key belonging to the failed node from the device(s). The failed node will no longer be able to write to the device(s). A manual reboot is required.</longdesc> <vendor-url></vendor-url> <parameters> <parameter name="action" unique="0" required="1"> @@ -86,22 +86,18 @@ </parameter> <parameter name="corosync-cmap_path" unique="0" required="0"> <getopt mixed="--corosync-cmap-path=[path]" /> - <content type="string" default="/usr/sbin/corosync-cmapctl" /> <shortdesc lang="en">Path to corosync-cmapctl binary</shortdesc> </parameter> <parameter name="sg_persist_path" unique="0" required="0"> <getopt mixed="--sg_persist-path=[path]" /> - <content type="string" default="/usr/bin/sg_persist" /> <shortdesc lang="en">Path to sg_persist binary</shortdesc> </parameter> <parameter name="sg_turs_path" unique="0" required="0"> <getopt mixed="--sg_turs-path=[path]" /> - <content type="string" default="/usr/bin/sg_turs" /> <shortdesc lang="en">Path to sg_turs binary</shortdesc> </parameter> <parameter name="vgs_path" unique="0" required="0"> <getopt mixed="--vgs-path=[path]" /> - <content type="string" default="/usr/sbin/vgs" /> <shortdesc lang="en">Path to vgs binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_tripplite_snmp.xml new/fence-agents-4.0.24/tests/data/metadata/fence_tripplite_snmp.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_tripplite_snmp.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_tripplite_snmp.xml 2016-08-22 14:33:58.000000000 +0200 @@ -155,17 +155,14 @@ </parameter> <parameter name="snmpget_path" unique="0" required="0"> <getopt mixed="--snmpget-path=[path]" /> - <content type="string" default="/usr/bin/snmpget" /> <shortdesc lang="en">Path to snmpget binary</shortdesc> </parameter> <parameter name="snmpset_path" unique="0" required="0"> <getopt mixed="--snmpset-path=[path]" /> - <content type="string" default="/usr/bin/snmpset" /> <shortdesc lang="en">Path to snmpset binary</shortdesc> </parameter> <parameter name="snmpwalk_path" unique="0" required="0"> <getopt mixed="--snmpwalk-path=[path]" /> - <content type="string" default="/usr/bin/snmpwalk" /> <shortdesc lang="en">Path to snmpwalk binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_vbox.xml new/fence-agents-4.0.24/tests/data/metadata/fence_vbox.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_vbox.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_vbox.xml 2016-08-22 14:33:58.000000000 +0200 @@ -137,12 +137,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="sudo_path" unique="0" required="0"> <getopt mixed="--sudo-path=[path]" /> - <content type="string" default="/usr/bin/sudo" /> <shortdesc lang="en">Path to sudo binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_virsh.xml new/fence-agents-4.0.24/tests/data/metadata/fence_virsh.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_virsh.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_virsh.xml 2016-08-22 14:33:58.000000000 +0200 @@ -137,12 +137,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="sudo_path" unique="0" required="0"> <getopt mixed="--sudo-path=[path]" /> - <content type="string" default="/usr/bin/sudo" /> <shortdesc lang="en">Path to sudo binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_vmware.xml new/fence-agents-4.0.24/tests/data/metadata/fence_vmware.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_vmware.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_vmware.xml 2016-08-22 14:33:58.000000000 +0200 @@ -143,7 +143,6 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_vmware_soap.xml new/fence-agents-4.0.24/tests/data/metadata/fence_vmware_soap.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_vmware_soap.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_vmware_soap.xml 2016-08-22 14:33:58.000000000 +0200 @@ -127,7 +127,6 @@ </parameter> <parameter name="gnutlscli_path" unique="0" required="0"> <getopt mixed="--gnutlscli-path=[path]" /> - <content type="string" default="/usr/bin/gnutls-cli" /> <shortdesc lang="en">Path to gnutls-cli binary</shortdesc> </parameter> </parameters> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fence-agents-4.0.23/tests/data/metadata/fence_wti.xml new/fence-agents-4.0.24/tests/data/metadata/fence_wti.xml --- old/fence-agents-4.0.23/tests/data/metadata/fence_wti.xml 2016-06-29 16:29:52.000000000 +0200 +++ new/fence-agents-4.0.24/tests/data/metadata/fence_wti.xml 2016-08-22 14:33:58.000000000 +0200 @@ -125,12 +125,10 @@ </parameter> <parameter name="ssh_path" unique="0" required="0"> <getopt mixed="--ssh-path=[path]" /> - <content type="string" default="/usr/bin/ssh" /> <shortdesc lang="en">Path to ssh binary</shortdesc> </parameter> <parameter name="telnet_path" unique="0" required="0"> <getopt mixed="--telnet-path=[path]" /> - <content type="string" default="/usr/bin/telnet" /> <shortdesc lang="en">Path to telnet binary</shortdesc> </parameter> </parameters>
