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 deleted file mode 100644 index d053574..0000000 --- a/0001-fence_compute-Create-nova-client-with-API-2.11.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - -The force_down API requires to use version 2.11 or later. ---- - fence/agents/compute/fence_compute.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index 0f05c12..f024aa5 100644 ---- a/fence/agents/compute/fence_compute.py -+++ b/fence/agents/compute/fence_compute.py -@@ -434,7 +434,7 @@ def main(): - sys.exit(0) - - # The first argument is the Nova client version -- nova = nova_client.Client('2', -+ nova = nova_client.Client('2.11', - options["--username"], - options["--password"], - options["--tenant-name"], --- -2.9.0 - diff --git a/0003-fence_compute-Only-list-nova-compute-services-when-g.patch b/0001-fence_compute-Only-list-nova-compute-services-when-g.patch similarity index 82% rename from 0003-fence_compute-Only-list-nova-compute-services-when-g.patch rename to 0001-fence_compute-Only-list-nova-compute-services-when-g.patch index 5a9e51b..f0d6dc0 100644 --- a/0003-fence_compute-Only-list-nova-compute-services-when-g.patch +++ b/0001-fence_compute-Only-list-nova-compute-services-when-g.patch @@ -1,7 +1,7 @@ -From 99ef77ee94d43545473281c017dc1a0189a467fe Mon Sep 17 00:00:00 2001 +From b6558964430c579b8a881807f43ec61fd38cd31b 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 +Subject: [PATCH 1/9] fence_compute: Only list nova-compute services when getting status We don't care about other services. @@ -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 07639cc..074b78f 100644 +index 1845cc4..6237f5e 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 07639cc..074b78f 100644 logging.debug("Status of %s is %s" % (service.binary, service.state)) if service.binary == "nova-compute": -- -2.9.0 +2.10.1 diff --git a/0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch b/0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch similarity index 94% rename from 0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch rename to 0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch index fe0a045..cb8828f 100644 --- a/0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch +++ b/0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch @@ -1,7 +1,7 @@ -From 610f1aea848e05ae3fc085975aee8fc36a41d4af Mon Sep 17 00:00:00 2001 +From 77a6ad6383ae1ffd26f771e394263e0d2fc4df5e 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 +Subject: [PATCH 2/9] fence_compute: Don't list hypervisors but nova-compute services Everything we do (evacuate, force_down) is on nova-compute services, so @@ -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 074b78f..994aeb2 100644 +index 6237f5e..e38c7bb 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py @@ -218,23 +218,23 @@ def fix_domain(options): @@ -80,5 +80,5 @@ index 074b78f..994aeb2 100644 result[longhost] = ("", None) result[shorthost] = ("", None) -- -2.9.0 +2.10.1 diff --git a/0002-fence_compute-Keep-compatibility-with-python-novacli.patch b/0002-fence_compute-Keep-compatibility-with-python-novacli.patch deleted file mode 100644 index 994ca52..0000000 --- a/0002-fence_compute-Keep-compatibility-with-python-novacli.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 - <= 2.26.0 - ---- - fence/agents/compute/fence_compute.py | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index f024aa5..07639cc 100644 ---- a/fence/agents/compute/fence_compute.py -+++ b/fence/agents/compute/fence_compute.py -@@ -412,7 +412,12 @@ def main(): - run_delay(options) - - try: -- from novaclient import client as nova_client -+ from distutils.version import LooseVersion -+ except ImportError: -+ fail_usage("distutils not found or not accessible") -+ -+ try: -+ import novaclient - except ImportError: - fail_usage("nova not found or not accessible") - -@@ -433,8 +438,12 @@ def main(): - elif options["--action"] in ["monitor", "status"]: - sys.exit(0) - -- # The first argument is the Nova client version -- nova = nova_client.Client('2.11', -+ if LooseVersion(novaclient.__version__) <= LooseVersion('2.26.0') : -+ api_version = '2' -+ else: -+ api_version = '2.11' -+ -+ nova = novaclient.client.Client(api_version, - options["--username"], - options["--password"], - options["--tenant-name"], --- -2.9.0 - diff --git a/0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch b/0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch similarity index 84% rename from 0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch rename to 0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch index 72b7b07..65da3b8 100644 --- a/0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch +++ b/0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch @@ -1,7 +1,7 @@ -From 93aab786cb3374b33a44433d845fe587262ee69d Mon Sep 17 00:00:00 2001 +From 6e6bb16ef33121603b6c7b958a7c96ddc8424877 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 +Subject: [PATCH 3/9] fence_compute: Do not override domain if it is already correct --- @@ -9,7 +9,7 @@ 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 994aeb2..cb637e2 100644 +index e38c7bb..470fd07 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py @@ -254,8 +254,8 @@ def fix_domain(options): @@ -24,5 +24,5 @@ index 994aeb2..cb637e2 100644 options["--domain"] = last_domain return options["--domain"] -- -2.9.0 +2.10.1 diff --git a/0004-fence_compute-Fix-handling-of-domain-None.patch b/0004-fence_compute-Fix-handling-of-domain-None.patch new file mode 100644 index 0000000..68cdd79 --- /dev/null +++ b/0004-fence_compute-Fix-handling-of-domain-None.patch @@ -0,0 +1,58 @@ +From 952c40fb84b182c3600f781ed6fe6373012424ef Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Wed, 29 Jun 2016 09:43:57 +0200 +Subject: [PATCH 4/9] fence_compute: Fix handling of domain == None + +--- + fence/agents/compute/fence_compute.py | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py +index 470fd07..3c19f02 100644 +--- a/fence/agents/compute/fence_compute.py ++++ b/fence/agents/compute/fence_compute.py +@@ -252,20 +252,18 @@ def fix_domain(options): + + elif len(domains) == 1 and "--domain" not in options: + options["--domain"] = last_domain +- return options["--domain"] + + 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"] = 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 ++ return last_domain + + def fix_plug_name(options): + if options["--action"] == "list": +@@ -275,14 +273,15 @@ def fix_plug_name(options): + return + + calculated = fix_domain(options) +- short_plug = options["--plug"].split('.')[0] +- logging.debug("Checking target '%s' against calculated domain '%s'"% (options["--plug"], options["--domain"])) + +- if "--domain" not in options: ++ if calculated is None or "--domain" not in options: + # Nothing supplied and nova not available... what to do... nothing + return + +- elif options["--domain"] == "": ++ short_plug = options["--plug"].split('.')[0] ++ logging.debug("Checking target '%s' against calculated domain '%s'"% (options["--plug"], calculated)) ++ ++ if options["--domain"] == "": + # Ensure any domain is stripped off since nova isn't using FQDN + options["--plug"] = short_plug + +-- +2.10.1 + diff --git a/0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch b/0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch similarity index 89% rename from 0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch rename to 0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch index 56e4ccf..b1a1ecf 100644 --- a/0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch +++ b/0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch @@ -1,7 +1,7 @@ -From 160e505367c30d1f8ba045fc1b3ab47bf09176ad Mon Sep 17 00:00:00 2001 +From 02a40aed59e4d6bb48ccd28e7558d18b0d03e7c0 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 +Subject: [PATCH 5/9] fence_compute: Fix fix_domain to not return too early We were returning from the loop, while we want the rest of the code to still execute (in case there are multiple domains in nova). @@ -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 37f48ee..1cb7df4 100644 +index 3c19f02..d39c053 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 37f48ee..1cb7df4 100644 if len(domains) == 0 and "--domain" not in options: logging.error("Could not calculate the domain names used by compute nodes in nova") -@@ -256,7 +252,7 @@ def fix_domain(options): +@@ -255,7 +251,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.9.0 +2.10.1 diff --git a/0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch b/0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch similarity index 69% rename from 0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch rename to 0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch index 10102d4..94c2167 100644 --- a/0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch +++ b/0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch @@ -1,7 +1,7 @@ -From f892771543d67d4b7b354349b390b16418d6c181 Mon Sep 17 00:00:00 2001 +From 0525e0cfb9299c4d3f93fea8e3da785406b6c5d7 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 +Subject: [PATCH 6/9] fence_compute: Fix fix_plug_name when looking if plug has domain We shouldn't check if the plug name contains the domain, but if it ends @@ -11,20 +11,20 @@ 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 1cb7df4..dd04e54 100644 +index d39c053..0cdf685 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py -@@ -283,8 +283,8 @@ def fix_plug_name(options): +@@ -281,8 +281,8 @@ def fix_plug_name(options): # Ensure any domain is stripped off since nova isn't using FQDN options["--plug"] = short_plug -- elif options["--plug"].find(options["--domain"]): +- elif options["--domain"] in options["--plug"]: - # Plug already contains the domain, don't re-add + elif options["--plug"].endswith(options["--domain"]): -+ # Plug already uses the domain, don't re-add ++ # Plug already uses the domain, don't re-add return else: -- -2.9.0 +2.10.1 diff --git a/0006-fence_compute-Fix-use-of-undefined-variable.patch b/0006-fence_compute-Fix-use-of-undefined-variable.patch deleted file mode 100644 index 4e79392..0000000 --- a/0006-fence_compute-Fix-use-of-undefined-variable.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 | 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 cb637e2..37f48ee 100644 ---- a/fence/agents/compute/fence_compute.py -+++ b/fence/agents/compute/fence_compute.py -@@ -275,14 +275,15 @@ def fix_plug_name(options): - return - - calculated = fix_domain(options) -+ -+ if calculated is None or "--domain" not in options: -+ # Nothing supplied and nova not available... what to do... nothing -+ return -+ - short_plug = options["--plug"].split('.')[0] - logging.debug("Checking target '%s' against calculated domain '%s'"% (options["--plug"], calculated)) - -- if "--domain" not in options: -- # Nothing supplied and nova not available... what to do... nothing -- return -- -- elif options["--domain"] == "": -+ if options["--domain"] == "": - # Ensure any domain is stripped off since nova isn't using FQDN - options["--plug"] = short_plug - --- -2.9.0 - diff --git a/0007-fence_compute-Remove-duplicate-check-for-binary-name.patch b/0007-fence_compute-Remove-duplicate-check-for-binary-name.patch new file mode 100644 index 0000000..9562a84 --- /dev/null +++ b/0007-fence_compute-Remove-duplicate-check-for-binary-name.patch @@ -0,0 +1,39 @@ +From 06c939730ccfcdef24370b09066a718e85f9dddc Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Tue, 18 Oct 2016 16:35:52 +0200 +Subject: [PATCH 7/9] fence_compute: Remove duplicate check for binary name + +We already do the filtering on the server side. +--- + fence/agents/compute/fence_compute.py | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py +index 0cdf685..cb7dfe3 100644 +--- a/fence/agents/compute/fence_compute.py ++++ b/fence/agents/compute/fence_compute.py +@@ -37,14 +37,13 @@ def get_power_status(_, options): + services = nova.services.list(host=options["--plug"], binary="nova-compute") + for service in services: + logging.debug("Status of %s is %s" % (service.binary, service.state)) +- if service.binary == "nova-compute": +- if service.state == "up": +- status = "on" +- elif service.state == "down": +- status = "off" +- else: +- logging.debug("Unknown status detected from nova: " + service.state) +- break ++ if service.state == "up": ++ status = "on" ++ elif service.state == "down": ++ status = "off" ++ else: ++ logging.debug("Unknown status detected from nova: " + service.state) ++ break + except requests.exception.ConnectionError as err: + logging.warning("Nova connection failed: " + str(err)) + return status +-- +2.10.1 + diff --git a/0008-Fix-travis.patch b/0008-Fix-travis.patch new file mode 100644 index 0000000..10f839b --- /dev/null +++ b/0008-Fix-travis.patch @@ -0,0 +1,26 @@ +From 20aa88df8d23b88bdb8d500bec9c8a9ea4ae2232 Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Thu, 1 Dec 2016 14:04:19 +0100 +Subject: [PATCH 8/9] Fix travis + +Regression introduced in 0f170a937bd0944e172004dc30df2fc240d9ca20 +--- + tests/data/metadata/fence_compute.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml +index 83bdb53..58f77a6 100644 +--- a/tests/data/metadata/fence_compute.xml ++++ b/tests/data/metadata/fence_compute.xml +@@ -9,7 +9,7 @@ + Fencing action + + +- ++ + + Keystone Admin Auth URL + +-- +2.10.1 + 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 bf0620e..c121130 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 2d7e1008a79627a8bab30d400dd6403adcd30e93 Mon Sep 17 00:00:00 2001 +From 6d2776559a5bb11b83e9703bed2aeec681207b78 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 @@ -11,17 +11,18 @@ However, we were only doing that if the nova-compute service was up; which is impossible if it's forced to be down... So just always disable force_down, and then, if it's up, do more things. --- - fence/agents/compute/fence_compute.py | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) + fence/agents/compute/fence_compute.py | 30 +++++++++++++++--------------- + 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py -index dd04e54..19d4974 100644 +index cb7dfe3..00a49cb 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py -@@ -160,23 +160,23 @@ def set_power_status(_, options): +@@ -159,23 +159,23 @@ def set_power_status(_, options): return if options["--action"] == "on": +- if get_power_status(_, options) != "on": + try: + # Forcing the host back up + nova.services.force_down( @@ -36,7 +37,7 @@ index dd04e54..19d4974 100644 + logging.info("Exception from attempt to force " + "host back up via nova API: " + "%s: %s" % (e.__class__.__name__, e)) - if get_power_status(_, options) == "on": ++ if get_power_status(_, options) == "on": # Forcing the service back up in case it was disabled nova.services.enable(options["--plug"], 'nova-compute') - try: @@ -57,5 +58,5 @@ index dd04e54..19d4974 100644 # Pretend we're 'on' so that the fencing library doesn't loop forever waiting for the node to boot override_status = "on" -- -2.9.0 +2.10.1 diff --git a/_service b/_service index 894df13..984957c 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ git .git fence-agents - 4.0.22+git.%ct.%h + 4.0.24+git.%ct.%h master enable diff --git a/_servicedata b/_servicedata index d6da15a..96dcf97 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/ClusterLabs/fence-agents.git - 15c5e92481fc35aef7c36801e500b7913d70edc3 \ No newline at end of file + e67fcd49e499b5d6acb9b8892a73a67acfa6ffa4 \ No newline at end of file diff --git a/fence-agents-4.0.24+git.1480563949.e67fcd4.tar.xz b/fence-agents-4.0.24+git.1480563949.e67fcd4.tar.xz new file mode 100644 index 0000000..77a5249 --- /dev/null +++ b/fence-agents-4.0.24+git.1480563949.e67fcd4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:596cb99c2340debda3d7bed7b9937ff65782889d6f32022b0c04bbef639853f7 +size 210244 diff --git a/fence-agents-4.0.24.tar.gz b/fence-agents-4.0.24.tar.gz deleted file mode 100644 index 9498596..0000000 --- a/fence-agents-4.0.24.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f41477d4b205a60f9f2c3912c686aad5542219d3d09ed39c0a20631842038986 -size 299281 diff --git a/fence-agents.changes b/fence-agents.changes index 7b2cba1..994373a 100644 --- a/fence-agents.changes +++ b/fence-agents.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Thu Dec 01 11:38:47 UTC 2016 - kgronlund@suse.com + +- Update to version 4.0.24+git.1480563949.e67fcd4: + * fence_azure_arm: add fencing agent for Azure Resource Manager + * fence_lpar: Add support for IVM + * fence_lpar: Handle exceptions when invalid output is read + * fence_zvmip: Update XML metadata + * fence_compute: fix ConnectionError by using full module name + * fence_powerman: add fence agent for powerman + * Suppress InsecureRequestWarning when ssl_insecure is given + * compute: Correctly handle installations without tagged flavours + * compute: Use the best available nova API version + * compute: correctly implement 'on' when the force-down API call is available + * compute: Correctly identify when the nodename already includes the supplied domain + * compute: Ensure we can connect to nova when fixing the plug name + * compute: Simpler check for nova force down compatibility + +- Rebase and remove merged patches: + * Remove 0001-fence_compute-Create-nova-client-with-API-2.11.patch + * Remove 0002-fence_compute-Keep-compatibility-with-python-novacli.patch + * Remove 0003-fence_compute-Only-list-nova-compute-services-when-g.patch + * Remove 0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch + * Remove 0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch + * Remove 0006-fence_compute-Fix-use-of-undefined-variable.patch + * Remove 0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch + * Remove 0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch + * Add 0001-fence_compute-Only-list-nova-compute-services-when-g.patch + * Add 0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch + * Add 0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch + * Add 0004-fence_compute-Fix-handling-of-domain-None.patch + * Add 0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch + * Add 0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch + * Add 0007-fence_compute-Remove-duplicate-check-for-binary-name.patch + * Add 0008-Fix-travis.patch + ------------------------------------------------------------------- Fri Aug 26 10:52:01 UTC 2016 - kgronlund@suse.com diff --git a/fence-agents.spec b/fence-agents.spec index 2d7e2ec..2e36708 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -22,26 +22,26 @@ 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.24 +Version: 4.0.24+git.1480563949.e67fcd4 Release: 0 Url: https://github.com/ClusterLabs/fence-agents -Source0: %{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM: fence_compute: Create nova client with API 2.11 -Patch1: 0001-fence_compute-Create-nova-client-with-API-2.11.patch -# PATCH-FIX-UPSTREAM: fence_compute: Keep compatibility with python-novaclient <= 2.26.0 -Patch2: 0002-fence_compute-Keep-compatibility-with-python-novacli.patch +Source0: %{name}-%{version}.tar.xz # PATCH-FIX-UPSTREAM: fence_compute: Only list nova-compute services when getting status -Patch3: 0003-fence_compute-Only-list-nova-compute-services-when-g.patch +Patch1: 0001-fence_compute-Only-list-nova-compute-services-when-g.patch # PATCH-FIX-UPSTREAM: fence_compute: On list, don't list hypervisors but nova-compute services -Patch4: 0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch +Patch2: 0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch # PATCH-FIX-UPSTREAM: fence_compute: Do not override domain if it is already correct -Patch5: 0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch -# PATCH-FIX-UPSTREAM: fence_compute: Fix use of undefined variable -Patch6: 0006-fence_compute-Fix-use-of-undefined-variable.patch +Patch3: 0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch +# PATCH-FIX-UPSTREAM: fence_compute: Fix handling of domain == None +Patch4: 0004-fence_compute-Fix-handling-of-domain-None.patch # PATCH-FIX-UPSTREAM: fence_compute: Fix fix_domain to not return too early -Patch7: 0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch +Patch5: 0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch # PATCH-FIX-UPSTREAM: fence_compute: Fix fix_plug_name when looking if plug has domain -Patch8: 0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch +Patch6: 0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch +# PATCH-FIX-UPSTREAM: fence_compute: Remove duplicate check for binary name +Patch7: 0007-fence_compute-Remove-duplicate-check-for-binary-name.patch +# PATCH-FIX-UPSTREAM: Fix travis regression +Patch8: 0008-Fix-travis.patch # PATCH-FIX-UPSTREAM: fence_compute: Fix disabling force_down on node when action is on Patch9: 0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch