fence-agents: master - fence_pve: Add support for --ssl-secure and --ssl-insecure

[Marek Grác]

Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=43b6d69fe...
Commit:        43b6d69fe0ae104c7aecb2cbb8f7caba3091165c
Parent:        d3d73eaa39dd49cc7fbc93b267daa7f51b1c5fff
Author:        Marek 'marx' Grac 
AuthorDate:    Mon Oct 13 10:33:18 2014 +0200
Committer:     Marek 'marx' Grac 
CommitterDate: Mon Oct 13 10:33:18 2014 +0200

fence_pve: Add support for --ssl-secure and --ssl-insecure

Resolves: rhbz#1151515
---
 fence/agents/pve/fence_pve.py |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fence/agents/pve/fence_pve.py b/fence/agents/pve/fence_pve.py
index 132234e..bb59a9b 100644
--- a/fence/agents/pve/fence_pve.py
+++ b/fence/agents/pve/fence_pve.py
@@ -106,8 +106,13 @@ def send_cmd(options, cmd, post=None):
    	conn.setopt(pycurl.POSTFIELDS, urllib.urlencode(post))
    conn.setopt(pycurl.WRITEFUNCTION, output_buffer.write)
    conn.setopt(pycurl.TIMEOUT, int(options["--shell-timeout"]))
-	conn.setopt(pycurl.SSL_VERIFYPEER, 0)
-	conn.setopt(pycurl.SSL_VERIFYHOST, 0)
+	if opt.has_key("--ssl") or opt.has_key("--ssl-secure"):
+		conn.setopt(pycurl.SSL_VERIFYPEER, 1)
+		conn.setopt(pycurl.SSL_VERIFYHOST, 2)
+
+	if opt.has_key("--ssl-insecure"):
+		conn.setopt(pycurl.SSL_VERIFYPEER, 0)
+		conn.setopt(pycurl.SSL_VERIFYHOST, 0)

logging.debug("URL: " + url)