diff --git a/0001-Use-Python-3-for-all-scripts-bsc-1065966.patch b/0001-Use-Python-3-for-all-scripts-bsc-1065966.patch index 25964f8..4fa139e 100644 --- a/0001-Use-Python-3-for-all-scripts-bsc-1065966.patch +++ b/0001-Use-Python-3-for-all-scripts-bsc-1065966.patch @@ -1,4 +1,4 @@ -From 67d60e07804f59512bd673fdb5bc020c02c48bcc Mon Sep 17 00:00:00 2001 +From ce334130410b6295ff208283d72aa21cbe02769f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= Date: Wed, 1 Nov 2017 10:28:22 +0100 Subject: [PATCH] Use Python 3 for all scripts (bsc#1065966) @@ -13,14 +13,13 @@ Subject: [PATCH] Use Python 3 for all scripts (bsc#1065966) fence/agents/autodetect/fence_lpar.py | 2 +- fence/agents/autodetect/fencing.py | 2 +- fence/agents/lib/tests/test_fencing.py | 2 +- - fence/agents/powerman/fence_powerman.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 ++-- - 16 files changed, 21 insertions(+), 21 deletions(-) + 15 files changed, 20 insertions(+), 20 deletions(-) diff --git a/fence/agents/autodetect/autodetect.py b/fence/agents/autodetect/autodetect.py index 24d9a731..366e5212 100755 @@ -112,16 +111,6 @@ index 6ee93858..389e9746 100644 import unittest import sys -diff --git a/fence/agents/powerman/fence_powerman.py b/fence/agents/powerman/fence_powerman.py -index 962fdb8f..7aeeaf12 100755 ---- a/fence/agents/powerman/fence_powerman.py -+++ b/fence/agents/powerman/fence_powerman.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!@PYTHON@ -tt - import os - import time - from datetime import datetime diff --git a/tests/fence_testing_test.py b/tests/fence_testing_test.py index 36b2a5e0..9da9d0cf 100755 --- a/tests/fence_testing_test.py @@ -218,5 +207,5 @@ index 8e82ed98..4204fae5 100755 \ No newline at end of file + main() -- -2.14.2 +2.16.2 diff --git a/_servicedata b/_servicedata index 1ee8773..7f9d63d 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ git://github.com/ClusterLabs/fence-agents.git - 6d2a8aad12e4a62441dd7ca78ae093960bc88dac \ No newline at end of file + 7473fab7350f3f26c203b7559a9092ed9ebcd047 \ No newline at end of file diff --git a/fence-agents-4.0.25+git.1518188333.853850c3.tar.xz b/fence-agents-4.0.25+git.1518188333.853850c3.tar.xz deleted file mode 100644 index e2ef7d3..0000000 --- a/fence-agents-4.0.25+git.1518188333.853850c3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25065a11b1cdad045c8325f3ab8379254e5a1ae2ace8e54e1cd9495f86fcbee6 -size 219788 diff --git a/fence-agents-4.0.25+git.1523367910.7473fab7.tar.xz b/fence-agents-4.0.25+git.1523367910.7473fab7.tar.xz new file mode 100644 index 0000000..a58a30e --- /dev/null +++ b/fence-agents-4.0.25+git.1523367910.7473fab7.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5a97072caac36c6420a7851a7c35f971eb329d22dfac717e733cf91957740b7 +size 223972 diff --git a/fence-agents.changes b/fence-agents.changes index 98f6eee..a8a54c8 100644 --- a/fence-agents.changes +++ b/fence-agents.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Apr 11 19:57:13 UTC 2018 - kgronlund@suse.com + +- Update to version 4.0.25+git.1523367910.7473fab7: + * Add fence_gce: Google Compute Engine fence support (fate#325539) (bsc#1088358) + * Low: fence_scsi: Remove period from cmd string + * fence_compute/fence_evacuate: revert to old parameters + * fence_azure_arm: implement network-fencing (w/library from @MSSedusch) + * fence_mpath: Correction of command line which argument is not correctly recognized + * Mid: fence_docker: Exclude slashes from the list. + * fence_pve : choose vm type either lxc or qemu + ------------------------------------------------------------------- Mon Feb 12 06:57:01 UTC 2018 - kgronlund@suse.com diff --git a/fence-agents.spec b/fence-agents.spec index c1c989c..2427317 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -17,13 +17,13 @@ %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 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 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 -License: GPL-2.0 and LGPL-2.1 +License: GPL-2.0-only AND LGPL-2.1-only Group: Productivity/Clustering/HA -Version: 4.0.25+git.1518188333.853850c3 +Version: 4.0.25+git.1523367910.7473fab7 Release: 0 Url: https://github.com/ClusterLabs/fence-agents Source0: %{name}-%{version}.tar.xz @@ -43,6 +43,8 @@ BuildRequires: perl BuildRequires: perl-Net-Telnet BuildRequires: pkg-config BuildRequires: python3 +BuildRequires: python3-google-api-python-client +BuildRequires: python3-oauth2client BuildRequires: python3-openwsman BuildRequires: python3-pexpect BuildRequires: python3-pycurl