From db0d731e53842722adb3f78a1d301058bf5fe21e516c693be83299daa492d319 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Fri, 26 Aug 2016 13:59:46 +0000 Subject: [PATCH] - 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 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=54 --- ...ute-Create-nova-client-with-API-2.11.patch | 8 +++--- ...ep-compatibility-with-python-novacli.patch | 10 ++++---- ...ly-list-nova-compute-services-when-g.patch | 6 ++--- ...n-t-list-hypervisors-but-nova-comput.patch | 12 ++++----- ...-not-override-domain-if-it-is-alread.patch | 12 ++++----- ...ompute-Fix-use-of-undefined-variable.patch | 25 ++++++------------- ...x-fix_domain-to-not-return-too-early.patch | 10 ++++---- ...x-fix_plug_name-when-looking-if-plug.patch | 8 +++--- ...x-disabling-force_down-on-node-when-.patch | 6 ++--- fence-agents-4.0.23.tar.gz | 3 --- fence-agents-4.0.24.tar.gz | 3 +++ fence-agents.changes | 8 ++++++ fence-agents.spec | 2 +- 13 files changed, 55 insertions(+), 58 deletions(-) delete mode 100644 fence-agents-4.0.23.tar.gz create mode 100644 fence-agents-4.0.24.tar.gz diff --git a/0001-fence_compute-Create-nova-client-with-API-2.11.patch b/0001-fence_compute-Create-nova-client-with-API-2.11.patch index fa7efdf..d053574 100644 --- a/0001-fence_compute-Create-nova-client-with-API-2.11.patch +++ b/0001-fence_compute-Create-nova-client-with-API-2.11.patch @@ -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 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 @@ The force_down API requires to use version 2.11 or later. 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 @@ index b93580b..a4f62dc 100644 options["--password"], options["--tenant-name"], -- -2.8.3 +2.9.0 diff --git a/0002-fence_compute-Keep-compatibility-with-python-novacli.patch b/0002-fence_compute-Keep-compatibility-with-python-novacli.patch index 6b1f11e..994ca52 100644 --- a/0002-fence_compute-Keep-compatibility-with-python-novacli.patch +++ b/0002-fence_compute-Keep-compatibility-with-python-novacli.patch @@ -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 Date: Wed, 23 Mar 2016 11:03:24 +0100 Subject: [PATCH 2/9] fence_compute: Keep compatibility with python-novaclient @@ -9,10 +9,10 @@ Subject: [PATCH 2/9] fence_compute: Keep compatibility with python-novaclient 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 @@ index a4f62dc..265a347 100644 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 @@ index a4f62dc..265a347 100644 options["--password"], options["--tenant-name"], -- -2.8.3 +2.9.0 diff --git a/0003-fence_compute-Only-list-nova-compute-services-when-g.patch b/0003-fence_compute-Only-list-nova-compute-services-when-g.patch index 97d96b7..5a9e51b 100644 --- a/0003-fence_compute-Only-list-nova-compute-services-when-g.patch +++ b/0003-fence_compute-Only-list-nova-compute-services-when-g.patch @@ -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 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 @@ We don't care about other services. 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 @@ index e3d5061..bb3798b 100644 logging.debug("Status of %s is %s" % (service.binary, service.state)) if service.binary == "nova-compute": -- -2.8.3 +2.9.0 diff --git a/0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch b/0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch index 62110de..fe0a045 100644 --- a/0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch +++ b/0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch @@ -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 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 @@ can be short hostnames. 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 @@ index bb3798b..f32c795 100644 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 @@ index bb3798b..f32c795 100644 result[longhost] = ("", None) result[shorthost] = ("", None) -- -2.8.3 +2.9.0 diff --git a/0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch b/0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch index 336bc3a..72b7b07 100644 --- a/0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch +++ b/0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch @@ -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 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 @@ Subject: [PATCH 5/9] fence_compute: Do not override domain if it is already 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 @@ index f32c795..b0f3c2e 100644 + 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 diff --git a/0006-fence_compute-Fix-use-of-undefined-variable.patch b/0006-fence_compute-Fix-use-of-undefined-variable.patch index e7d0155..4e79392 100644 --- a/0006-fence_compute-Fix-use-of-undefined-variable.patch +++ b/0006-fence_compute-Fix-use-of-undefined-variable.patch @@ -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 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 @@ index b0f3c2e..8665e50 100644 options["--plug"] = short_plug -- -2.8.3 +2.9.0 diff --git a/0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch b/0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch index 3cb7b8e..56e4ccf 100644 --- a/0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch +++ b/0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch @@ -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 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 @@ Also simplify the code... 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 @@ index 8665e50..3b0c729 100644 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 diff --git a/0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch b/0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch index ce0cb23..10102d4 100644 --- a/0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch +++ b/0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch @@ -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 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 @@ with the domain. 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 @@ index 3b0c729..b083660 100644 else: -- -2.8.3 +2.9.0 diff --git a/0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch b/0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch index 49a34c9..bf0620e 100644 --- a/0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch +++ b/0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch @@ -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 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 @@ force_down, and then, if it's up, do more things. 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 @@ index e3d5061..98ad177 100644 # 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 diff --git a/fence-agents-4.0.23.tar.gz b/fence-agents-4.0.23.tar.gz deleted file mode 100644 index 1a34e47..0000000 --- a/fence-agents-4.0.23.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d1ae9960ffdc328c394630632d7b452379e3e5b0dddf59aac97a1e291c9f29d -size 299185 diff --git a/fence-agents-4.0.24.tar.gz b/fence-agents-4.0.24.tar.gz new file mode 100644 index 0000000..9498596 --- /dev/null +++ b/fence-agents-4.0.24.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f41477d4b205a60f9f2c3912c686aad5542219d3d09ed39c0a20631842038986 +size 299281 diff --git a/fence-agents.changes b/fence-agents.changes index fbaf061..7b2cba1 100644 --- a/fence-agents.changes +++ b/fence-agents.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Aug 26 10:52:01 UTC 2016 - kgronlund@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 + ------------------------------------------------------------------- Thu Jun 30 09:46:45 UTC 2016 - kgronlund@suse.com diff --git a/fence-agents.spec b/fence-agents.spec index db77937..2d7e2ec 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -22,7 +22,7 @@ Name: fence-agents 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