fence-agents: master - library: Add support for URL session instead of hostname

Marek Grác marx at fedoraproject.org
Mon Apr 4 14:20:49 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=ab223883b3d79ef46c91c23fb32ba93c72b49762
Commit:        ab223883b3d79ef46c91c23fb32ba93c72b49762
Parent:        8a97abd04b8492310c1095413c5cf26bbf98e395
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Mon Apr 4 15:32:03 2011 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Mon Apr 4 15:32:03 2011 +0200

library: Add support for URL session instead of hostname

Fence agent can choose if they prefer to set address to fencing device
as hostname/ip address or URL.
---
 fence/agents/lib/fencing.py.py |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 32b5d2b..ef55759 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -387,6 +387,13 @@ all_opt = {
 		"required" : "0",
 		"shortdesc" : "Count of attempts to retry power on",
 		"order" : 201 },
+	"session_url" : {
+		"getopt" : "s:",
+		"longopt" : "session-url",
+		"help" : "-s, --session-url              URL to connect to XenServer on.",
+		"required" : "1",
+		"shortdesc" : "The URL of the XenServer host.",
+		"order" : 1},
 	"uuid" : {
 		"getopt" : "U:",
 		"longopt" : "uuid",
@@ -676,7 +683,7 @@ def check_input(device_opt, opt):
 	if (0 == options.has_key("-l")) and device_opt.count("login") and (device_opt.count("no_login") == 0):
 		fail_usage("Failed: You have to set login name")
 
-	if 0 == options.has_key("-a"):
+	if 0 == options.has_key("-a") and 0 == options.has_key("-s"):
 		fail_usage("Failed: You have to enter fence address")
 
 	if (device_opt.count("no_password") == 0):


More information about the cluster-commits mailing list