|
 |
182b9e |
diff -Naurd fence-agents-4.0.2.orig/fence/agents/cisco_ucs/fence_cisco_ucs.py fence-agents-4.0.2/fence/agents/cisco_ucs/fence_cisco_ucs.py
|
|
|
182b9e |
--- fence-agents-4.0.2.orig/fence/agents/cisco_ucs/fence_cisco_ucs.py 2013-07-30 12:46:11.000000000 +0200
|
|
|
182b9e |
+++ fence-agents-4.0.2/fence/agents/cisco_ucs/fence_cisco_ucs.py 2014-02-20 11:53:07.576955152 +0100
|
|
|
182b9e |
@@ -107,7 +107,7 @@
|
|
|
182b9e |
"order" : 1 }
|
|
|
182b9e |
|
|
|
182b9e |
def main():
|
|
|
182b9e |
- device_opt = [ "ipaddr", "login", "passwd", "ssl", "port", "web", "suborg" ]
|
|
|
182b9e |
+ device_opt = [ "ipaddr", "login", "passwd", "ssl", "notls", "port", "web", "suborg" ]
|
|
|
182b9e |
|
|
|
182b9e |
atexit.register(atexit_handler)
|
|
|
182b9e |
|
|
|
182b9e |
diff -Naurd fence-agents-4.0.2.orig/fence/agents/ilo/fence_ilo.py fence-agents-4.0.2/fence/agents/ilo/fence_ilo.py
|
|
|
182b9e |
--- fence-agents-4.0.2.orig/fence/agents/ilo/fence_ilo.py 2014-02-20 11:52:28.948883919 +0100
|
|
|
182b9e |
+++ fence-agents-4.0.2/fence/agents/ilo/fence_ilo.py 2014-02-20 11:53:07.655955297 +0100
|
|
|
182b9e |
@@ -63,7 +63,7 @@
|
|
|
182b9e |
"order" : 1 }
|
|
|
182b9e |
|
|
|
182b9e |
def main():
|
|
|
182b9e |
- device_opt = [ "ipaddr", "login", "passwd", "ssl", "ribcl" ]
|
|
|
182b9e |
+ device_opt = [ "ipaddr", "login", "passwd", "ssl", "notls", "ribcl" ]
|
|
|
182b9e |
|
|
|
182b9e |
atexit.register(atexit_handler)
|
|
|
182b9e |
|
|
|
182b9e |
diff -Naurd fence-agents-4.0.2.orig/fence/agents/lib/fencing.py.py fence-agents-4.0.2/fence/agents/lib/fencing.py.py
|
|
|
182b9e |
--- fence-agents-4.0.2.orig/fence/agents/lib/fencing.py.py 2014-02-20 11:52:29.345884646 +0100
|
|
|
182b9e |
+++ fence-agents-4.0.2/fence/agents/lib/fencing.py.py 2014-02-20 11:53:07.655955297 +0100
|
|
|
182b9e |
@@ -177,6 +177,14 @@
|
|
|
182b9e |
"required" : "0",
|
|
|
182b9e |
"shortdesc" : "SSL connection",
|
|
|
182b9e |
"order" : 1 },
|
|
|
182b9e |
+ "notls" : {
|
|
|
182b9e |
+ "getopt" : "t",
|
|
|
182b9e |
+ "longopt" : "notls",
|
|
|
182b9e |
+ "help" : "-t, --notls Disable TLS negotiation and force SSL3.0.\n" +
|
|
|
182b9e |
+ " This should only be used for devices that do not support TLS1.0 and up.",
|
|
|
182b9e |
+ "required" : "0",
|
|
|
182b9e |
+ "shortdesc" : "Disable TLS negotiation",
|
|
|
182b9e |
+ "order" : 1 },
|
|
|
182b9e |
"port" : {
|
|
|
182b9e |
"getopt" : "n:",
|
|
|
182b9e |
"longopt" : "plug",
|
|
|
182b9e |
@@ -927,7 +935,11 @@
|
|
|
182b9e |
re_pass = re.compile("(password)|(pass phrase)", re.IGNORECASE)
|
|
|
182b9e |
|
|
|
182b9e |
if options.has_key("--ssl"):
|
|
|
182b9e |
- command = '%s --insecure --crlf -p %s %s' % (SSL_PATH, options["--ipport"], options["--ip"])
|
|
|
182b9e |
+ gnutls_opts=""
|
|
|
182b9e |
+ if options.has_key("--notls"):
|
|
|
182b9e |
+ gnutls_opts = "--priority \"NORMAL:-VERS-TLS1.2:-VERS-TLS1.1:-VERS-TLS1.0:+VERS-SSL3.0\""
|
|
|
182b9e |
+
|
|
|
182b9e |
+ command = '%s %s --insecure --crlf -p %s %s' % (SSL_PATH, gnutls_opts, options["--ipport"], options["--ip"])
|
|
|
182b9e |
try:
|
|
|
182b9e |
conn = fspawn(options, command)
|
|
|
182b9e |
except pexpect.ExceptionPexpect, ex:
|
|
|
182b9e |
diff -Naurd fence-agents-4.0.2.orig/fence/agents/rhevm/fence_rhevm.py fence-agents-4.0.2/fence/agents/rhevm/fence_rhevm.py
|
|
|
182b9e |
--- fence-agents-4.0.2.orig/fence/agents/rhevm/fence_rhevm.py 2013-07-30 12:46:12.000000000 +0200
|
|
|
182b9e |
+++ fence-agents-4.0.2/fence/agents/rhevm/fence_rhevm.py 2014-02-20 11:53:07.655955297 +0100
|
|
|
182b9e |
@@ -101,7 +101,7 @@
|
|
|
182b9e |
return result
|
|
|
182b9e |
|
|
|
182b9e |
def main():
|
|
|
182b9e |
- device_opt = [ "ipaddr", "login", "passwd", "ssl", "web", "port" ]
|
|
|
182b9e |
+ device_opt = [ "ipaddr", "login", "passwd", "ssl", "notls", "web", "port" ]
|
|
|
182b9e |
|
|
|
182b9e |
atexit.register(atexit_handler)
|
|
|
182b9e |
|
|
|
182b9e |
diff -Naurd fence-agents-4.0.2.orig/fence/agents/vmware_soap/fence_vmware_soap.py fence-agents-4.0.2/fence/agents/vmware_soap/fence_vmware_soap.py
|
|
|
182b9e |
--- fence-agents-4.0.2.orig/fence/agents/vmware_soap/fence_vmware_soap.py 2014-02-20 11:52:29.000884014 +0100
|
|
|
182b9e |
+++ fence-agents-4.0.2/fence/agents/vmware_soap/fence_vmware_soap.py 2014-02-20 11:53:07.656955299 +0100
|
|
|
182b9e |
@@ -177,7 +177,7 @@
|
|
|
182b9e |
shutil.rmtree(tmp_dir)
|
|
|
182b9e |
|
|
|
182b9e |
def main():
|
|
|
182b9e |
- device_opt = [ "ipaddr", "login", "passwd", "web", "ssl", "port" ]
|
|
|
182b9e |
+ device_opt = [ "ipaddr", "login", "passwd", "web", "ssl", "notls", "port" ]
|
|
|
182b9e |
|
|
|
182b9e |
atexit.register(atexit_handler)
|
|
|
182b9e |
|