- Update to version 4.0.9 (bnc#877996)

+ Allow ssl connections to fallback to SSL3.0 negotiation
  + fence_vmware_soap: fix short/long option parsing traceback
  + fence_raritan: new fence agent for Raritan Dominion PX
  + fencing: Replace printing to stderr with proper logging solution
  + fence_wti: Action 'list' prints also named groups
  + fence_ipmilan: send empty password, if password is not entered
  + fence_vmware: Invalid arguments for vmware_get_outlets_vi()
  + fence_amt: sending password over env
  + fencing: Introduce new device option 'no_status'
  + fence_pve: new fence-agent for Proxmox VE
  + fence_ovh: --delay should be applied before attempt to login
- Exclude dummy fence agent fence_dummy (bnc#877950)
- Remove obsolete fence-agents-add-longdesc.patch

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/fence-agents?expand=0&rev=11
This commit is contained in:
Kristoffer Gronlund 2014-05-15 09:25:41 +00:00 committed by Git OBS Bridge
parent 10e940dc1c
commit 03e38ff640
5 changed files with 39 additions and 402 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0669b358d26853c60015eb898c746124f037940b545143cff6c12f724a36680a
size 604852

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1286c868f087bd200ea55692c803d77ec2f57f40b61aa9b97c0fada5adfe68d2
size 199500

View File

@ -1,387 +0,0 @@
diff -ru fence-agents-3.1.6/fence/agents/lib/fencing.py.py fence-agents-3.1.6.new/fence/agents/lib/fencing.py.py
--- fence-agents-3.1.6/fence/agents/lib/fencing.py.py 2011-09-30 13:22:43.000000000 +0200
+++ fence-agents-3.1.6.new/fence/agents/lib/fencing.py.py 2012-07-05 19:09:53.625276000 +0200
@@ -37,6 +37,7 @@
"help" : "-h, --help Display this help and exit",
"required" : "0",
"shortdesc" : "Display help and exit",
+ "longdesc" : "Display help and exit",
"order" : 54 },
"version" : {
"getopt" : "V",
@@ -44,6 +45,7 @@
"help" : "-V, --version Output version information and exit",
"required" : "0",
"shortdesc" : "Display version information and exit",
+ "longdesc" : "Display version information and exit",
"order" : 53 },
"quiet" : {
"getopt" : "q",
@@ -55,6 +57,7 @@
"help" : "-v, --verbose Verbose mode",
"required" : "0",
"shortdesc" : "Verbose mode",
+ "longdesc" : "Verbose mode",
"order" : 51 },
"debug" : {
"getopt" : "D:",
@@ -62,6 +65,7 @@
"help" : "-D, --debug-file=<debugfile> Debugging to output file",
"required" : "0",
"shortdesc" : "Write debug information to given file",
+ "longdesc" : "Write debug information to given file",
"order" : 52 },
"delay" : {
"getopt" : "f:",
@@ -69,6 +73,7 @@
"help" : "--delay <seconds> Wait X seconds before fencing is started",
"required" : "0",
"shortdesc" : "Wait X seconds before fencing is started",
+ "longdesc" : "Wait X seconds before fencing is started",
"default" : "0",
"order" : 200 },
"agent" : {
@@ -85,6 +90,7 @@
"help" : "-o, --action=<action> Action: status, reboot (default), off or on",
"required" : "1",
"shortdesc" : "Fencing Action",
+ "longdesc" : "Fencing Action",
"default" : "reboot",
"order" : 1 },
"io_fencing" : {
@@ -93,6 +99,7 @@
"help" : "-o, --action=<action> Action: status, enable or disable",
"required" : "1",
"shortdesc" : "Fencing Action",
+ "longdesc" : "Fencing Action",
"default" : "disable",
"order" : 1 },
"ipaddr" : {
@@ -101,6 +108,7 @@
"help" : "-a, --ip=<ip> IP address or hostname of fencing device",
"required" : "1",
"shortdesc" : "IP Address or Hostname",
+ "longdesc" : "IP Address or Hostname",
"order" : 1 },
"ipport" : {
"getopt" : "u:",
@@ -108,6 +116,7 @@
"help" : "-u, --ipport=<port> TCP port to use",
"required" : "0",
"shortdesc" : "TCP port to use for connection with device",
+ "longdesc" : "TCP port to use for connection with device",
"order" : 1 },
"login" : {
"getopt" : "l:",
@@ -115,6 +124,7 @@
"help" : "-l, --username=<name> Login name",
"required" : "?",
"shortdesc" : "Login Name",
+ "longdesc" : "Login Name",
"order" : 1 },
"no_login" : {
"getopt" : "",
@@ -130,6 +140,7 @@
"help" : "-p, --password=<password> Login password or passphrase",
"required" : "0",
"shortdesc" : "Login password or passphrase",
+ "longdesc" : "Login password or passphrase",
"order" : 1 },
"passwd_script" : {
"getopt" : "S:",
@@ -137,6 +148,7 @@
"help" : "-S, --password-script=<script> Script to run to retrieve password",
"required" : "0",
"shortdesc" : "Script to retrieve password",
+ "longdesc" : "Script to retrieve password",
"order" : 1 },
"identity_file" : {
"getopt" : "k:",
@@ -144,6 +156,7 @@
"help" : "-k, --identity-file=<filename> Identity file (private key) for ssh ",
"required" : "0",
"shortdesc" : "Identity file for ssh",
+ "longdesc" : "Identity file for ssh",
"order" : 1 },
"module_name" : {
"getopt" : "m:",
@@ -151,6 +164,7 @@
"help" : "-m, --module-name=<module> DRAC/MC module name",
"required" : "0",
"shortdesc" : "DRAC/MC module name",
+ "longdesc" : "DRAC/MC module name",
"order" : 1 },
"drac_version" : {
"getopt" : "d:",
@@ -158,6 +172,7 @@
"help" : "-d, --drac-version=<version> Force DRAC version to use",
"required" : "0",
"shortdesc" : "Force DRAC version to use",
+ "longdesc" : "Force DRAC version to use",
"order" : 1 },
"hmc_version" : {
"getopt" : "H:",
@@ -165,6 +180,7 @@
"help" : "-H, --hmc-version=<version> Force HMC version to use: 3, 4 (default)",
"required" : "0",
"shortdesc" : "Force HMC version to use (3 or 4)",
+ "longdesc" : "Force HMC version to use (3 or 4)",
"default" : "4",
"order" : 1 },
"ribcl" : {
@@ -173,6 +189,7 @@
"help" : "-r, --ribcl-version=<version> Force ribcl version to use",
"required" : "0",
"shortdesc" : "Force ribcl version to use",
+ "longdesc" : "Force ribcl version to use",
"order" : 1 },
"login_eol_lf" : {
"getopt" : "",
@@ -184,6 +201,7 @@
"longopt" : "command-prompt",
"help" : "-c, --command-prompt=<prompt> Force command prompt",
"shortdesc" : "Force command prompt",
+ "longdesc" : "Force command prompt",
"required" : "0",
"order" : 1 },
"secure" : {
@@ -191,6 +209,7 @@
"longopt" : "ssh",
"help" : "-x, --ssh Use ssh connection",
"shortdesc" : "SSH connection",
+ "longdesc" : "SSH connection",
"required" : "0",
"order" : 1 },
"ssl" : {
@@ -199,6 +218,7 @@
"help" : "-z, --ssl Use ssl connection",
"required" : "0",
"shortdesc" : "SSL connection",
+ "longdesc" : "SSL connection",
"order" : 1 },
"port" : {
"getopt" : "n:",
@@ -207,6 +227,7 @@
" name of virtual machine",
"required" : "1",
"shortdesc" : "Physical plug number or name of virtual machine",
+ "longdesc" : "Physical plug number or name of virtual machine",
"order" : 1 },
"switch" : {
"getopt" : "s:",
@@ -214,6 +235,7 @@
"help" : "-s, --switch=<id> Physical switch number on device",
"required" : "0",
"shortdesc" : "Physical switch number on device",
+ "longdesc" : "Physical switch number on device",
"order" : 1 },
"suborg" : {
"getopt" : "s:",
@@ -221,6 +243,7 @@
"help" : "--suborg=<path> Additional path needed to access suborganization",
"required" : "0",
"shortdesc" : "Additional path needed to access suborganization",
+ "longdesc" : "Additional path needed to access suborganization",
"default" : "",
"order" : 1 },
"partition" : {
@@ -228,12 +251,14 @@
"help" : "-n <id> Name of the partition",
"required" : "0",
"shortdesc" : "Partition name",
+ "longdesc" : "Partition name",
"order" : 1 },
"managed" : {
"getopt" : "s:",
"help" : "-s <id> Name of the managed system",
"required" : "0",
"shortdesc" : "Managed system name",
+ "longdesc" : "Managed system name",
"order" : 1 },
"test" : {
"getopt" : "T",
@@ -246,6 +271,7 @@
"help" : "-e, --exec=<command> Command to execute",
"required" : "0",
"shortdesc" : "Command to execute",
+ "longdesc" : "Command to execute",
"order" : 1 },
"vmware_type" : {
"getopt" : "d:",
@@ -253,6 +279,7 @@
"help" : "-d, --vmware_type=<type> Type of VMware to connect",
"required" : "0",
"shortdesc" : "Type of VMware to connect",
+ "longdesc" : "Type of VMware to connect",
"order" : 1 },
"vmware_datacenter" : {
"getopt" : "s:",
@@ -260,6 +287,7 @@
"help" : "-s, --vmware-datacenter=<dc> VMWare datacenter filter",
"required" : "0",
"shortdesc" : "Show only machines in specified datacenter",
+ "longdesc" : "Show only machines in specified datacenter",
"order" : 2 },
"snmp_version" : {
"getopt" : "d:",
@@ -267,6 +295,7 @@
"help" : "-d, --snmp-version=<ver> Specifies SNMP version to use",
"required" : "0",
"shortdesc" : "Specifies SNMP version to use (1,2c,3)",
+ "longdesc" : "Specifies SNMP version to use (1,2c,3)",
"order" : 1 },
"community" : {
"getopt" : "c:",
@@ -274,6 +303,7 @@
"help" : "-c, --community=<community> Set the community string",
"required" : "0",
"shortdesc" : "Set the community string",
+ "longdesc" : "Set the community string",
"order" : 1},
"snmp_auth_prot" : {
"getopt" : "b:",
@@ -281,6 +311,7 @@
"help" : "-b, --snmp-auth-prot=<prot> Set authentication protocol (MD5|SHA)",
"required" : "0",
"shortdesc" : "Set authentication protocol (MD5|SHA)",
+ "longdesc" : "Set authentication protocol (MD5|SHA)",
"order" : 1},
"snmp_sec_level" : {
"getopt" : "E:",
@@ -289,6 +320,7 @@
" (noAuthNoPriv|authNoPriv|authPriv)",
"required" : "0",
"shortdesc" : "Set security level (noAuthNoPriv|authNoPriv|authPriv)",
+ "longdesc" : "Set security level (noAuthNoPriv|authNoPriv|authPriv)",
"order" : 1},
"snmp_priv_prot" : {
"getopt" : "B:",
@@ -296,6 +328,7 @@
"help" : "-B, --snmp-priv-prot=<prot> Set privacy protocol (DES|AES)",
"required" : "0",
"shortdesc" : "Set privacy protocol (DES|AES)",
+ "longdesc" : "Set privacy protocol (DES|AES)",
"order" : 1},
"snmp_priv_passwd" : {
"getopt" : "P:",
@@ -303,6 +336,7 @@
"help" : "-P, --snmp-priv-passwd=<pass> Set privacy protocol password",
"required" : "0",
"shortdesc" : "Set privacy protocol password",
+ "longdesc" : "Set privacy protocol password",
"order" : 1},
"snmp_priv_passwd_script" : {
"getopt" : "R:",
@@ -310,6 +344,7 @@
"help" : "-R, --snmp-priv-passwd-script Script to run to retrieve privacy password",
"required" : "0",
"shortdesc" : "Script to run to retrieve privacy password",
+ "longdesc" : "Script to run to retrieve privacy password",
"order" : 1},
"inet4_only" : {
"getopt" : "4",
@@ -317,6 +352,7 @@
"help" : "-4, --inet4-only Forces agent to use IPv4 addresses only",
"required" : "0",
"shortdesc" : "Forces agent to use IPv4 addresses only",
+ "longdesc" : "Forces agent to use IPv4 addresses only",
"order" : 1 },
"inet6_only" : {
"getopt" : "6",
@@ -324,6 +360,7 @@
"help" : "-6, --inet6-only Forces agent to use IPv6 addresses only",
"required" : "0",
"shortdesc" : "Forces agent to use IPv6 addresses only",
+ "longdesc" : "Forces agent to use IPv6 addresses only",
"order" : 1 },
"udpport" : {
"getopt" : "u:",
@@ -331,6 +368,7 @@
"help" : "-u, --udpport UDP/TCP port to use",
"required" : "0",
"shortdesc" : "UDP/TCP port to use for connection with device",
+ "longdesc" : "UDP/TCP port to use for connection with device",
"order" : 1},
"separator" : {
"getopt" : "C:",
@@ -339,6 +377,7 @@
"default" : ",",
"required" : "0",
"shortdesc" : "Separator for CSV created by operation list",
+ "longdesc" : "Separator for CSV created by operation list",
"order" : 100 },
"login_timeout" : {
"getopt" : "y:",
@@ -347,6 +386,7 @@
"default" : "5",
"required" : "0",
"shortdesc" : "Wait X seconds for cmd prompt after login",
+ "longdesc" : "Wait X seconds for cmd prompt after login",
"order" : 200 },
"shell_timeout" : {
"getopt" : "Y:",
@@ -355,6 +395,7 @@
"default" : "3",
"required" : "0",
"shortdesc" : "Wait X seconds for cmd prompt after issuing command",
+ "longdesc" : "Wait X seconds for cmd prompt after issuing command",
"order" : 200 },
"power_timeout" : {
"getopt" : "g:",
@@ -363,6 +404,7 @@
"default" : "20",
"required" : "0",
"shortdesc" : "Test X seconds for status change after ON/OFF",
+ "longdesc" : "Test X seconds for status change after ON/OFF",
"order" : 200 },
"power_wait" : {
"getopt" : "G:",
@@ -371,6 +413,7 @@
"default" : "0",
"required" : "0",
"shortdesc" : "Wait X seconds after issuing ON/OFF",
+ "longdesc" : "Wait X seconds after issuing ON/OFF",
"order" : 200 },
"missing_as_off" : {
"getopt" : "M",
@@ -378,6 +421,7 @@
"help" : "--missing-as-off Missing port returns OFF instead of failure",
"required" : "0",
"shortdesc" : "Missing port returns OFF instead of failure",
+ "longdesc" : "Missing port returns OFF instead of failure",
"order" : 200 },
"retry_on" : {
"getopt" : "F:",
@@ -386,6 +430,7 @@
"default" : "1",
"required" : "0",
"shortdesc" : "Count of attempts to retry power on",
+ "longdesc" : "Count of attempts to retry power on",
"order" : 201 },
"session_url" : {
"getopt" : "s:",
@@ -393,6 +438,7 @@
"help" : "-s, --session-url URL to connect to XenServer on.",
"required" : "1",
"shortdesc" : "The URL of the XenServer host.",
+ "longdesc" : "The URL of the XenServer host.",
"order" : 1},
"uuid" : {
"getopt" : "U:",
@@ -400,6 +446,7 @@
"help" : "-U, --uuid UUID of the VM to fence.",
"required" : "0",
"shortdesc" : "The UUID of the virtual machine to fence.",
+ "longdesc" : "The UUID of the virtual machine to fence.",
"order" : 1}
}
@@ -502,6 +549,8 @@
print "\t\t<content type=\"boolean\" "+default+" />"
print "\t\t<shortdesc lang=\"en\">" + all_opt[option]["shortdesc"] + "</shortdesc>"
+ try: print "\t\t<longdesc lang=\"en\">" + all_opt[option]["longdesc"] + "</longdesc>"
+ except: pass
print "\t</parameter>"
print "</parameters>"
print "<actions>"

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Thu May 15 08:58:47 UTC 2014 - kgronlund@suse.com
- Update to version 4.0.9 (bnc#877996)
+ Allow ssl connections to fallback to SSL3.0 negotiation
+ fence_vmware_soap: fix short/long option parsing traceback
+ fence_raritan: new fence agent for Raritan Dominion PX
+ fencing: Replace printing to stderr with proper logging solution
+ fence_wti: Action 'list' prints also named groups
+ fence_ipmilan: send empty password, if password is not entered
+ fence_vmware: Invalid arguments for vmware_get_outlets_vi()
+ fence_amt: sending password over env
+ fencing: Introduce new device option 'no_status'
+ fence_pve: new fence-agent for Proxmox VE
+ fence_ovh: --delay should be applied before attempt to login
- Exclude dummy fence agent fence_dummy (bnc#877950)
- Remove obsolete fence-agents-add-longdesc.patch
-------------------------------------------------------------------
Tue Feb 18 10:00:55 UTC 2014 - kgronlund@suse.com

View File

@ -22,17 +22,19 @@ 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.7
Version: 4.0.9
Release: 0
Url: http://git.fedorahosted.org/git/fence-agents.git
Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.xz
Patch1: fence-agents-add-longdesc.patch
Source0: %{name}-%{version}.tar.xz
Requires: python-curl
Requires: python-openssl
Requires: python-pexpect
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glibc-devel
BuildRequires: libtool
BuildRequires: libxml2-tools
BuildRequires: libxslt
BuildRequires: mozilla-nspr-devel
@ -149,11 +151,11 @@ Authors:
%prep
%setup -q -n %{name}-%{version}
#%patch1 -p1
%build
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
export CFLAGS
./autogen.sh
%{configure}
make %{_smp_mflags}
@ -179,23 +181,25 @@ fi
%files
%defattr(-,root,root,-)
%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence
#%dir %{_sysconfdir}/cluster
#%%dir %%{_sysconfdir}/cluster
%dir %{plugin_dir}
%dir %{_libdir}/stonith/plugins
%dir %{_libdir}/stonith
%{_datadir}/fence
%{_datadir}/cluster
#%{_sbindir}/fence_cisco_ucs
#%{_mandir}/man8/fence_cisco_ucs*
#%%{_sbindir}/fence_cisco_ucs
#%%{_mandir}/man8/fence_cisco_ucs*
%{plugin_dir}/fence_cisco_ucs
#%files -n fence-agents-unsupported
#%defattr(-,root,root,-)
#%config(noreplace) %{_sysconfdir}/cluster/fence_na.conf
#%%files -n fence-agents-unsupported
#%%defattr(-,root,root,-)
#%%config(noreplace) %%{_sysconfdir}/cluster/fence_na.conf
%{_sbindir}/fence_*
#%exclude %{_sbindir}/fence_cisco_ucs
#%%exclude %%{_sbindir}/fence_cisco_ucs
%exclude %{_sbindir}/fence_dummy
%exclude %{_mandir}/man8/fence_dummy*
%{_mandir}/man8/fence_*
#%exclude %{_mandir}/man8/fence_cisco_ucs*
#%%exclude %%{_mandir}/man8/fence_cisco_ucs*
%{_libexecdir}/fence_*
%changelog