fence-agents: master - fence_cisco_ucs: protocol prefix of URL was not correctly set with --ssl-(in)secure

Marek GrĂ¡c marx at fedoraproject.org
Wed Nov 19 10:04:53 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=766e747471acce46b8e3a5fb77a944008ad5a452
Commit:        766e747471acce46b8e3a5fb77a944008ad5a452
Parent:        0e5893247c7fb881df234d515189f0df6a0b2597
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Nov 19 11:04:19 2014 +0100
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Nov 19 11:04:19 2014 +0100

fence_cisco_ucs: protocol prefix of URL was not correctly set with --ssl-(in)secure

Resolves: rhbz#1165591
---
 fence/agents/cisco_ucs/fence_cisco_ucs.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py
index 191f1b1..6288207 100644
--- a/fence/agents/cisco_ucs/fence_cisco_ucs.py
+++ b/fence/agents/cisco_ucs/fence_cisco_ucs.py
@@ -77,7 +77,7 @@ def get_list(conn, options):
 
 def send_command(opt, command, timeout):
 	## setup correct URL
-	if opt.has_key("--ssl"):
+	if "--ssl" in opt or "--ssl-secure" in opt or "--ssl-insecure" in opt:
 		url = "https:"
 	else:
 		url = "http:"


More information about the cluster-commits mailing list