Hello community, here is the log from the commit of package fence-agents for openSUSE:Factory checked in at 2018-06-22 13:34:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fence-agents (Old) and /work/SRC/openSUSE:Factory/.fence-agents.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fence-agents" Fri Jun 22 13:34:54 2018 rev:40 rq:618070 version:4.2.1+git.1529316875.1a39345b Changes: -------- --- /work/SRC/openSUSE:Factory/fence-agents/fence-agents.changes 2018-05-18 14:27:55.190333510 +0200 +++ /work/SRC/openSUSE:Factory/.fence-agents.new/fence-agents.changes 2018-06-22 13:34:57.875579075 +0200 @@ -1,0 +2,25 @@ +Wed Jun 20 09:06:43 UTC 2018 - [email protected] + +- Update to version 4.2.1+git.1529316875.1a39345b: + * fence_vmware_soap: fix Python 3 suds issue + * Added python-novaclient and python-keystoneclient in configure.ac + * novaclient 1.1 depcrecated, so making changes for novaclient + * Python keystoneclient also included to pacify CI + * Changed travis to include pythomn-novaclient + * Fencing Agent for Openstack + * fence_scsi: fix python3 encoding error #206 + * fence_ipmilan: add missing fence_ilo3 and fence_ilo4 metadata + * fence_scsi: match device names using re.MULTILINE to avoid duplicating names in /var/run/cluster/fence_scsi.dev + * fence_gce: use default credentials from googleapiclient + * run_command: fix Python 3 encoding issue + +- Drop merged patches: + * Remove 0002-fence_gce-fix-regression-missing-import-googleapicli.patch + * Remove 0003-fence_gce-fix-regression-missing-import-oauth2client.patch + * Remove 0004-fence_gce-use-default-credentials-from-googleapiclie.patch + * Remove 0005-run_command-fix-Python-3-encoding-issue.patch + +- Enable GCE fence agent for all targets (fate#325539) (bsc#1088358) +- Enable fence_openstack agent (bsc#1097803) + +------------------------------------------------------------------- Old: ---- 0002-fence_gce-fix-regression-missing-import-googleapicli.patch 0003-fence_gce-fix-regression-missing-import-oauth2client.patch 0004-fence_gce-use-default-credentials-from-googleapiclie.patch 0005-run_command-fix-Python-3-encoding-issue.patch fence-agents-4.0.25+git.1524215631.8f9c770a.tar.xz New: ---- fence-agents-4.2.1+git.1529316875.1a39345b.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fence-agents.spec ++++++ --- /var/tmp/diff_new_pack.ltZEGn/_old 2018-06-22 13:34:59.071534865 +0200 +++ /var/tmp/diff_new_pack.ltZEGn/_new 2018-06-22 13:34:59.075534717 +0200 @@ -17,29 +17,17 @@ %global plugin_dir %{_libdir}/stonith/plugins/rhcs -%if 0%{?is_opensuse} -%define agent_list alom amt amt_ws apc apc_snmp azure_arm bladecenter brocade cisco_mds cisco_ucs compute docker drac5 dummy eaton_snmp emerson eps evacuate gce hds_cb hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan ironic kdump ldom lpar mpath netio powerman pve raritan rcd_serial rhevm rsa rsb sanbox2 sbd scsi vbox virsh vmware vmware_rest wti xenapi zvm -%else -%define agent_list alom amt amt_ws apc apc_snmp azure_arm bladecenter brocade cisco_mds cisco_ucs compute docker drac5 dummy eaton_snmp emerson eps evacuate hds_cb hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan ironic kdump ldom lpar mpath netio powerman pve raritan rcd_serial rhevm rsa rsb sanbox2 sbd scsi vbox virsh vmware vmware_rest wti xenapi zvm -%endif +%define agent_list alom amt amt_ws apc apc_snmp azure_arm bladecenter brocade cisco_mds cisco_ucs compute docker drac5 dummy eaton_snmp emerson eps evacuate gce hds_cb hpblade ibmblade ifmib ilo ilo_moonshot ilo_mp ilo_ssh intelmodular ipdu ipmilan ironic kdump ldom lpar mpath netio openstack powerman pve raritan rcd_serial rhevm rsa rsb sanbox2 sbd scsi vbox virsh vmware vmware_rest wti xenapi zvm Name: fence-agents Summary: Fence Agents for High Availability License: GPL-2.0-only AND LGPL-2.1-only Group: Productivity/Clustering/HA -Version: 4.0.25+git.1524215631.8f9c770a +Version: 4.2.1+git.1529316875.1a39345b Release: 0 Url: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.xz Patch1: 0001-Use-Python-3-for-all-scripts-bsc-1065966.patch -# fence_gce: fix regression - missing import googleapiclient.discovery -Patch2: 0002-fence_gce-fix-regression-missing-import-googleapicli.patch -# fence_gce: fix regression - missing import oauth2client.client -Patch3: 0003-fence_gce-fix-regression-missing-import-oauth2client.patch -# fence_gce: use default credentials from googleapiclient -Patch4: 0004-fence_gce-use-default-credentials-from-googleapiclie.patch -# run_command: fix Python 3 encoding issue (bsc#1082871) -Patch5: 0005-run_command-fix-Python-3-encoding-issue.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -55,10 +43,10 @@ BuildRequires: perl-Net-Telnet BuildRequires: pkg-config BuildRequires: python3 -%if 0%{?is_opensuse} BuildRequires: python3-google-api-python-client +BuildRequires: python3-keystoneclient +BuildRequires: python3-novaclient BuildRequires: python3-oauth2client -%endif BuildRequires: python3-openwsman BuildRequires: python3-pexpect BuildRequires: python3-pycurl @@ -111,10 +99,6 @@ %prep %setup -q -n %{name}-%{version} %patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 %build CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" ++++++ 0001-Use-Python-3-for-all-scripts-bsc-1065966.patch ++++++ --- /var/tmp/diff_new_pack.ltZEGn/_old 2018-06-22 13:34:59.099533830 +0200 +++ /var/tmp/diff_new_pack.ltZEGn/_new 2018-06-22 13:34:59.099533830 +0200 @@ -1,110 +1,110 @@ -From ce334130410b6295ff208283d72aa21cbe02769f Mon Sep 17 00:00:00 2001 +From cb2c637fa006c566af05ae84b5085c9a9b14541d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <[email protected]> -Date: Wed, 1 Nov 2017 10:28:22 +0100 +Date: Wed, 20 Jun 2018 11:12:56 +0200 Subject: [PATCH] Use Python 3 for all scripts (bsc#1065966) --- - fence/agents/autodetect/autodetect.py | 2 +- - fence/agents/autodetect/autodetect_test.py | 2 +- - fence/agents/autodetect/fence_apc.py | 2 +- - fence/agents/autodetect/fence_bladecenter.py | 2 +- - fence/agents/autodetect/fence_brocade.py | 2 +- - fence/agents/autodetect/fence_ilo_moonshot.py | 2 +- - fence/agents/autodetect/fence_lpar.py | 2 +- - fence/agents/autodetect/fencing.py | 2 +- - fence/agents/lib/tests/test_fencing.py | 2 +- - tests/fence_testing_test.py | 2 +- - tests/test-apc2.py | 4 ++-- - tests/test-apc5.py | 4 ++-- - tests/test-drac4.py | 4 ++-- - tests/test-multi-apc2.py | 4 ++-- - tests/test.py | 4 ++-- - 15 files changed, 20 insertions(+), 20 deletions(-) + agents/autodetect/autodetect.py | 2 +- + agents/autodetect/autodetect_test.py | 2 +- + agents/autodetect/fence_apc.py | 2 +- + agents/autodetect/fence_bladecenter.py | 2 +- + agents/autodetect/fence_brocade.py | 2 +- + agents/autodetect/fence_ilo_moonshot.py | 2 +- + agents/autodetect/fence_lpar.py | 2 +- + agents/autodetect/fencing.py | 2 +- + lib/tests/test_fencing.py | 2 +- + tests/fence_testing_test.py | 2 +- + tests/test-apc2.py | 2 +- + tests/test-apc5.py | 2 +- + tests/test-drac4.py | 2 +- + tests/test-multi-apc2.py | 2 +- + tests/test.py | 2 +- + 15 files changed, 15 insertions(+), 15 deletions(-) -diff --git a/fence/agents/autodetect/autodetect.py b/fence/agents/autodetect/autodetect.py +diff --git a/agents/autodetect/autodetect.py b/agents/autodetect/autodetect.py index 24d9a731..366e5212 100755 ---- a/fence/agents/autodetect/autodetect.py -+++ b/fence/agents/autodetect/autodetect.py +--- a/agents/autodetect/autodetect.py ++++ b/agents/autodetect/autodetect.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import pexpect import re -diff --git a/fence/agents/autodetect/autodetect_test.py b/fence/agents/autodetect/autodetect_test.py +diff --git a/agents/autodetect/autodetect_test.py b/agents/autodetect/autodetect_test.py index a18aaed0..462c469d 100755 ---- a/fence/agents/autodetect/autodetect_test.py -+++ b/fence/agents/autodetect/autodetect_test.py +--- a/agents/autodetect/autodetect_test.py ++++ b/agents/autodetect/autodetect_test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 import unittest import autodetect as detect -diff --git a/fence/agents/autodetect/fence_apc.py b/fence/agents/autodetect/fence_apc.py +diff --git a/agents/autodetect/fence_apc.py b/agents/autodetect/fence_apc.py index c6dd106e..935f18e8 100644 ---- a/fence/agents/autodetect/fence_apc.py -+++ b/fence/agents/autodetect/fence_apc.py +--- a/agents/autodetect/fence_apc.py ++++ b/agents/autodetect/fence_apc.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -tt +#!/usr/bin/python3 -tt ##### ## -diff --git a/fence/agents/autodetect/fence_bladecenter.py b/fence/agents/autodetect/fence_bladecenter.py +diff --git a/agents/autodetect/fence_bladecenter.py b/agents/autodetect/fence_bladecenter.py index d72c07f1..dbcdb0d8 100644 ---- a/fence/agents/autodetect/fence_bladecenter.py -+++ b/fence/agents/autodetect/fence_bladecenter.py +--- a/agents/autodetect/fence_bladecenter.py ++++ b/agents/autodetect/fence_bladecenter.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -tt +#!/usr/bin/python3 -tt ##### ## -diff --git a/fence/agents/autodetect/fence_brocade.py b/fence/agents/autodetect/fence_brocade.py +diff --git a/agents/autodetect/fence_brocade.py b/agents/autodetect/fence_brocade.py index 5257bccb..f1df7a23 100644 ---- a/fence/agents/autodetect/fence_brocade.py -+++ b/fence/agents/autodetect/fence_brocade.py +--- a/agents/autodetect/fence_brocade.py ++++ b/agents/autodetect/fence_brocade.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -tt +#!/usr/bin/python3 -tt import sys, re import atexit -diff --git a/fence/agents/autodetect/fence_ilo_moonshot.py b/fence/agents/autodetect/fence_ilo_moonshot.py +diff --git a/agents/autodetect/fence_ilo_moonshot.py b/agents/autodetect/fence_ilo_moonshot.py index e161ac65..a7e827bb 100644 ---- a/fence/agents/autodetect/fence_ilo_moonshot.py -+++ b/fence/agents/autodetect/fence_ilo_moonshot.py +--- a/agents/autodetect/fence_ilo_moonshot.py ++++ b/agents/autodetect/fence_ilo_moonshot.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -tt +#!/usr/bin/python3 -tt import sys import atexit -diff --git a/fence/agents/autodetect/fence_lpar.py b/fence/agents/autodetect/fence_lpar.py +diff --git a/agents/autodetect/fence_lpar.py b/agents/autodetect/fence_lpar.py index 6676e1c6..59cc2213 100644 ---- a/fence/agents/autodetect/fence_lpar.py -+++ b/fence/agents/autodetect/fence_lpar.py +--- a/agents/autodetect/fence_lpar.py ++++ b/agents/autodetect/fence_lpar.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -tt +#!/usr/bin/python3 -tt ##### ## -diff --git a/fence/agents/autodetect/fencing.py b/fence/agents/autodetect/fencing.py +diff --git a/agents/autodetect/fencing.py b/agents/autodetect/fencing.py index ea21ace1..5d891eee 100644 ---- a/fence/agents/autodetect/fencing.py -+++ b/fence/agents/autodetect/fencing.py +--- a/agents/autodetect/fencing.py ++++ b/agents/autodetect/fencing.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -tt +#!/usr/bin/python3 -tt import sys, getopt, time, os, uuid, pycurl, stat import pexpect, re, syslog -diff --git a/fence/agents/lib/tests/test_fencing.py b/fence/agents/lib/tests/test_fencing.py +diff --git a/lib/tests/test_fencing.py b/lib/tests/test_fencing.py index 6ee93858..389e9746 100644 ---- a/fence/agents/lib/tests/test_fencing.py -+++ b/fence/agents/lib/tests/test_fencing.py +--- a/lib/tests/test_fencing.py ++++ b/lib/tests/test_fencing.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 @@ -122,7 +122,7 @@ import unittest import fence_testing diff --git a/tests/test-apc2.py b/tests/test-apc2.py -index bb5aefd8..bc120dcb 100755 +index bb5aefd8..d4325b9d 100755 --- a/tests/test-apc2.py +++ b/tests/test-apc2.py @@ -1,4 +1,4 @@ @@ -131,15 +131,8 @@ from fence_testing import test_action -@@ -14,4 +14,4 @@ def main(): - test_action(DEVICE, ACT_LIST, "getopt") - - if __name__ == "__main__": -- main() -\ No newline at end of file -+ main() diff --git a/tests/test-apc5.py b/tests/test-apc5.py -index 6cea3b1c..8c24ecf5 100755 +index 6cea3b1c..2679b15b 100755 --- a/tests/test-apc5.py +++ b/tests/test-apc5.py @@ -1,4 +1,4 @@ @@ -148,15 +141,8 @@ from fence_testing import test_action -@@ -14,4 +14,4 @@ def main(): - test_action(DEVICE, ACT_LIST, "getopt") - - if __name__ == "__main__": -- main() -\ No newline at end of file -+ main() diff --git a/tests/test-drac4.py b/tests/test-drac4.py -index 75c24c51..d4b14cb2 100755 +index 75c24c51..b750f0f3 100755 --- a/tests/test-drac4.py +++ b/tests/test-drac4.py @@ -1,4 +1,4 @@ @@ -165,15 +151,8 @@ from fence_testing import test_action -@@ -12,4 +12,4 @@ def main(): - test_action(DRAC4, ACT_ONOFF, "stdin") - - if __name__ == "__main__": -- main() -\ No newline at end of file -+ main() diff --git a/tests/test-multi-apc2.py b/tests/test-multi-apc2.py -index 7ab9754d..1c03912e 100755 +index 7ab9754d..e06e3d97 100755 --- a/tests/test-multi-apc2.py +++ b/tests/test-multi-apc2.py @@ -1,4 +1,4 @@ @@ -182,15 +161,8 @@ from fence_testing import test_action -@@ -14,4 +14,4 @@ def main(): - test_action(DEVICE, ACT_LIST, "getopt") - - if __name__ == "__main__": -- main() -\ No newline at end of file -+ main() diff --git a/tests/test.py b/tests/test.py -index 8e82ed98..4204fae5 100755 +index 8e82ed98..a39822ec 100755 --- a/tests/test.py +++ b/tests/test.py @@ -1,4 +1,4 @@ @@ -199,13 +171,6 @@ from fence_testing import test_action -@@ -18,4 +18,4 @@ def main(): - test_action(DUMMYDEF, ACT_ONOFF, "getopt") - - if __name__ == "__main__": -- main() -\ No newline at end of file -+ main() -- -2.16.2 +2.17.1 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.ltZEGn/_old 2018-06-22 13:34:59.123532943 +0200 +++ /var/tmp/diff_new_pack.ltZEGn/_new 2018-06-22 13:34:59.127532795 +0200 @@ -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.25+git.%ct.%h</param> + <param name="versionformat">4.2.1+git.%ct.%h</param> <param name="revision">master</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.ltZEGn/_old 2018-06-22 13:34:59.155531760 +0200 +++ /var/tmp/diff_new_pack.ltZEGn/_new 2018-06-22 13:34:59.159531612 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/ClusterLabs/fence-agents.git</param> - <param name="changesrevision">bec154345d2291c9051c16277de9054387dc9707</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">9b763accb5c4c4a1cf60a19592a4033bcedec500</param></service></servicedata> \ No newline at end of file ++++++ fence-agents-4.0.25+git.1524215631.8f9c770a.tar.xz -> fence-agents-4.2.1+git.1529316875.1a39345b.tar.xz ++++++ ++++ 104936 lines of diff (skipped)
