From 1fb963ffb9620a7e7482135618b1529fcee2de1cd12361aff5956126db201325 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Tue, 17 Apr 2018 14:14:36 +0000 Subject: [PATCH 1/4] Change %doc to %license OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=82 --- fence-agents.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fence-agents.spec b/fence-agents.spec index 2427317..9663a60 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -129,7 +129,7 @@ PYTHONPATH=fence/agents/lib python fence/agents/lib/tests/test_fencing.py %files %defattr(-,root,root,-) -%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence +%license doc/COPYING.* doc/COPYRIGHT doc/README.licence %dir %{plugin_dir} %dir %{_libdir}/stonith/plugins %dir %{_libdir}/stonith From 3bdf22b9144bf8b59d85f234279e85c446eba4bf9cc731c9282ad4540c7c1429 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Wed, 25 Apr 2018 20:29:33 +0000 Subject: [PATCH 2/4] - Disable Google Compute Engine support unless openSUSE (fate#325539) (bsc#1088358) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=83 --- fence-agents.changes | 5 +++++ fence-agents.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fence-agents.changes b/fence-agents.changes index a8a54c8..d9852f2 100644 --- a/fence-agents.changes +++ b/fence-agents.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 25 20:28:19 UTC 2018 - kgronlund@suse.com + +- Disable Google Compute Engine support unless openSUSE (fate#325539) (bsc#1088358) + ------------------------------------------------------------------- Wed Apr 11 19:57:13 UTC 2018 - kgronlund@suse.com diff --git a/fence-agents.spec b/fence-agents.spec index 9663a60..733194c 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -17,7 +17,7 @@ %global plugin_dir %{_libdir}/stonith/plugins/rhcs -%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 +%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 %{?is_opensuse: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 Name: fence-agents Summary: Fence Agents for High Availability @@ -43,8 +43,10 @@ BuildRequires: perl BuildRequires: perl-Net-Telnet BuildRequires: pkg-config BuildRequires: python3 +%if 0%{?is_opensuse} BuildRequires: python3-google-api-python-client BuildRequires: python3-oauth2client +%endif BuildRequires: python3-openwsman BuildRequires: python3-pexpect BuildRequires: python3-pycurl From 4a0947b82416b56e7386f00a266028b983a1126f1bd69320eba8df640cb05731 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Thu, 26 Apr 2018 05:45:06 +0000 Subject: [PATCH 3/4] - Update to version 4.0.25+git.1524215631.8f9c770a: * fence_gce: Write error messages to log (fate#325539) (bsc#1088358) * fence_azure_arm: fix subscriptionId from metadata (bsc#1090995) * fence_scsi: fix plug-parameter and keep support for nodename to avoid regressions OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=84 --- _servicedata | 2 +- fence-agents-4.0.25+git.1523367910.7473fab7.tar.xz | 3 --- fence-agents-4.0.25+git.1524215631.8f9c770a.tar.xz | 3 +++ fence-agents.changes | 8 ++++++++ fence-agents.spec | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 fence-agents-4.0.25+git.1523367910.7473fab7.tar.xz create mode 100644 fence-agents-4.0.25+git.1524215631.8f9c770a.tar.xz diff --git a/_servicedata b/_servicedata index 7f9d63d..5dc8ccd 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/ClusterLabs/fence-agents.git - 7473fab7350f3f26c203b7559a9092ed9ebcd047 \ No newline at end of file + bec154345d2291c9051c16277de9054387dc9707 \ No newline at end of file diff --git a/fence-agents-4.0.25+git.1523367910.7473fab7.tar.xz b/fence-agents-4.0.25+git.1523367910.7473fab7.tar.xz deleted file mode 100644 index a58a30e..0000000 --- a/fence-agents-4.0.25+git.1523367910.7473fab7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5a97072caac36c6420a7851a7c35f971eb329d22dfac717e733cf91957740b7 -size 223972 diff --git a/fence-agents-4.0.25+git.1524215631.8f9c770a.tar.xz b/fence-agents-4.0.25+git.1524215631.8f9c770a.tar.xz new file mode 100644 index 0000000..c1bda09 --- /dev/null +++ b/fence-agents-4.0.25+git.1524215631.8f9c770a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee413b7cded60948b8efcccd8ad98d1f5272377aec652a673e461da7db141070 +size 224144 diff --git a/fence-agents.changes b/fence-agents.changes index d9852f2..a13bacb 100644 --- a/fence-agents.changes +++ b/fence-agents.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 26 05:37:33 UTC 2018 - kgronlund@suse.com + +- Update to version 4.0.25+git.1524215631.8f9c770a: + * fence_gce: Write error messages to log (fate#325539) (bsc#1088358) + * fence_azure_arm: fix subscriptionId from metadata (bsc#1090995) + * fence_scsi: fix plug-parameter and keep support for nodename to avoid regressions + ------------------------------------------------------------------- Wed Apr 25 20:28:19 UTC 2018 - kgronlund@suse.com diff --git a/fence-agents.spec b/fence-agents.spec index 733194c..9dd3842 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -23,7 +23,7 @@ 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.1523367910.7473fab7 +Version: 4.0.25+git.1524215631.8f9c770a Release: 0 Url: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.xz From dcb700386a92782344e9ef6932ad6bcbbb5f8a370693fadd640ee6b0f262d7be Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Thu, 26 Apr 2018 06:23:36 +0000 Subject: [PATCH 4/4] Fix rpm macro OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=85 --- fence-agents.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fence-agents.spec b/fence-agents.spec index 9dd3842..fb81a31 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -17,7 +17,11 @@ %global plugin_dir %{_libdir}/stonith/plugins/rhcs -%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 %{?is_opensuse: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 +%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 Name: fence-agents Summary: Fence Agents for High Availability