Hello community,

here is the log from the commit of package fence-agents for openSUSE:Factory 
checked in at 2016-12-03 18:27:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-29 15:45:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.fence-agents.new/fence-agents.changes   
2016-12-03 18:27:17.000000000 +0100
@@ -1,0 +2,36 @@
+Thu Dec 01 11:38:47 UTC 2016 - [email protected]
+
+- 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
+
+-------------------------------------------------------------------

Old:
----
  0001-fence_compute-Create-nova-client-with-API-2.11.patch
  0002-fence_compute-Keep-compatibility-with-python-novacli.patch
  0003-fence_compute-Only-list-nova-compute-services-when-g.patch
  0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch
  0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch
  0006-fence_compute-Fix-use-of-undefined-variable.patch
  0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
  0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
  fence-agents-4.0.24.tar.gz

New:
----
  0001-fence_compute-Only-list-nova-compute-services-when-g.patch
  0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch
  0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch
  0004-fence_compute-Fix-handling-of-domain-None.patch
  0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
  0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
  0007-fence_compute-Remove-duplicate-check-for-binary-name.patch
  0008-Fix-travis.patch
  fence-agents-4.0.24+git.1480563949.e67fcd4.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fence-agents.spec ++++++
--- /var/tmp/diff_new_pack.oKkPuy/_old  2016-12-03 18:27:19.000000000 +0100
+++ /var/tmp/diff_new_pack.oKkPuy/_new  2016-12-03 18:27:19.000000000 +0100
@@ -22,26 +22,26 @@
 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
 

++++++ 0003-fence_compute-Only-list-nova-compute-services-when-g.patch -> 
0001-fence_compute-Only-list-nova-compute-services-when-g.patch ++++++
--- 
/work/SRC/openSUSE:Factory/fence-agents/0003-fence_compute-Only-list-nova-compute-services-when-g.patch
     2016-08-29 15:45:08.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.fence-agents.new/0001-fence_compute-Only-list-nova-compute-services-when-g.patch
        2016-12-03 18:27:17.000000000 +0100
@@ -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 <[email protected]>
 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 @@
  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 @@
                                logging.debug("Status of %s is %s" % 
(service.binary, service.state))
                                if service.binary == "nova-compute":
 -- 
-2.9.0
+2.10.1
 

++++++ 0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch -> 
0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch ++++++
--- 
/work/SRC/openSUSE:Factory/fence-agents/0004-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch
     2016-08-29 15:45:12.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.fence-agents.new/0002-fence_compute-Don-t-list-hypervisors-but-nova-comput.patch
        2016-12-03 18:27:17.000000000 +0100
@@ -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 <[email protected]>
 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 @@
  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 @@
                        result[longhost] = ("", None)
                        result[shorthost] = ("", None)
 -- 
-2.9.0
+2.10.1
 

++++++ 0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch -> 
0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch ++++++
--- 
/work/SRC/openSUSE:Factory/fence-agents/0005-fence_compute-Do-not-override-domain-if-it-is-alread.patch
     2016-08-29 15:45:14.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.fence-agents.new/0003-fence_compute-Do-not-override-domain-if-it-is-alread.patch
        2016-12-03 18:27:17.000000000 +0100
@@ -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 <[email protected]>
 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 @@
  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 @@
                options["--domain"] = last_domain
                return options["--domain"]
 -- 
-2.9.0
+2.10.1
 

++++++ 0004-fence_compute-Fix-handling-of-domain-None.patch ++++++
>From 952c40fb84b182c3600f781ed6fe6373012424ef Mon Sep 17 00:00:00 2001
From: Vincent Untz <[email protected]>
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

++++++ 0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch -> 
0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch ++++++
--- 
/work/SRC/openSUSE:Factory/fence-agents/0007-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
     2016-08-29 15:45:20.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.fence-agents.new/0005-fence_compute-Fix-fix_domain-to-not-return-too-early.patch
        2016-12-03 18:27:17.000000000 +0100
@@ -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 <[email protected]>
 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 @@
  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 @@
        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
 

++++++ 0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch -> 
0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch ++++++
--- 
/work/SRC/openSUSE:Factory/fence-agents/0008-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
     2016-08-29 15:45:23.000000000 +0200
+++ 
/work/SRC/openSUSE:Factory/.fence-agents.new/0006-fence_compute-Fix-fix_plug_name-when-looking-if-plug.patch
        2016-12-03 18:27:17.000000000 +0100
@@ -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 <[email protected]>
 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 @@
  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
 

++++++ 0007-fence_compute-Remove-duplicate-check-for-binary-name.patch ++++++
>From 06c939730ccfcdef24370b09066a718e85f9dddc Mon Sep 17 00:00:00 2001
From: Vincent Untz <[email protected]>
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

++++++ 0008-Fix-travis.patch ++++++
>From 20aa88df8d23b88bdb8d500bec9c8a9ea4ae2232 Mon Sep 17 00:00:00 2001
From: Vincent Untz <[email protected]>
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 @@
                <shortdesc lang="en">Fencing action</shortdesc>
        </parameter>
        <parameter name="auth-url" unique="0" required="0">
-               <getopt mixed="-k, --auth-url=[tenant]" />
+               <getopt mixed="-k, --auth-url=[url]" />
                <content type="string" default=""  />
                <shortdesc lang="en">Keystone Admin Auth URL</shortdesc>
        </parameter>
-- 
2.10.1

++++++ 0009-fence_compute-Fix-disabling-force_down-on-node-when-.patch ++++++
--- /var/tmp/diff_new_pack.oKkPuy/_old  2016-12-03 18:27:19.000000000 +0100
+++ /var/tmp/diff_new_pack.oKkPuy/_new  2016-12-03 18:27:19.000000000 +0100
@@ -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 <[email protected]>
 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 @@
 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 @@
 +                      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 @@
                        # 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
 

++++++ _service ++++++
--- /var/tmp/diff_new_pack.oKkPuy/_old  2016-12-03 18:27:19.000000000 +0100
+++ /var/tmp/diff_new_pack.oKkPuy/_new  2016-12-03 18:27:19.000000000 +0100
@@ -4,7 +4,7 @@
     <param name="scm">git</param>
     <param name="exclude">.git</param>
     <param name="filename">fence-agents</param>
-    <param name="versionformat">4.0.22+git.%ct.%h</param>
+    <param name="versionformat">4.0.24+git.%ct.%h</param>
     <param name="revision">master</param>
     <param name="changesgenerate">enable</param>
   </service>

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.oKkPuy/_old  2016-12-03 18:27:19.000000000 +0100
+++ /var/tmp/diff_new_pack.oKkPuy/_new  2016-12-03 18:27:19.000000000 +0100
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param 
name="url">git://github.com/ClusterLabs/fence-agents.git</param>
-          <param 
name="changesrevision">15c5e92481fc35aef7c36801e500b7913d70edc3</param></service></servicedata>
\ No newline at end of file
+          <param 
name="changesrevision">e67fcd49e499b5d6acb9b8892a73a67acfa6ffa4</param></service></servicedata>
\ No newline at end of file


Reply via email to