fence-agents: master - [cleanup] Removing unused part which was replaced by proper 'default' values for 'ipport'

Marek GrĂ¡c marx at fedoraproject.org
Wed Apr 23 15:50:42 UTC 2014


Gitweb:        http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=33aa9709b40af9727a6bf66f8c0e5ed3ef4572ca
Commit:        33aa9709b40af9727a6bf66f8c0e5ed3ef4572ca
Parent:        ea615b438ee7bcef77bed9add7a7fe8760a1b7fc
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Apr 16 17:26:34 2014 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Apr 23 17:39:23 2014 +0200

[cleanup] Removing unused part which was replaced by proper 'default' values for 'ipport'

---
 fence/agents/lib/fencing.py.py |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index b4ecea7..ff4cf7f 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -747,16 +747,6 @@ def check_input(device_opt, opt):
 	if options.has_key("--snmp-priv-passwd-script"):
 		options["--snmp-priv-passwd"] = os.popen(options["--snmp-priv-passwd-script"]).read().rstrip()
 
-	if options.has_key("--ipport") == False:
-		if options.has_key("--ssh"):
-			options["--ipport"] = 22
-		elif options.has_key("--ssl"):
-			options["--ipport"] = 443
-		elif device_opt.count("web"):
-			options["--ipport"] = 80
-		else:
-			options["--ipport"] = 23
-
 	if options.has_key("--plug") and len(options["--plug"].split(",")) > 1 and \
 			options.has_key("--method") and options["--method"] == "cycle":
 		fail_usage("Failed: Cannot use --method cycle for more than 1 plug")


More information about the cluster-commits mailing list