|
 |
e4ffb1 |
From 31d6f75837251dae4a494fe361105c8f6fa63a17 Mon Sep 17 00:00:00 2001
|
|
|
e4ffb1 |
From: Marek 'marx' Grac <mgrac@redhat.com>
|
|
|
e4ffb1 |
Date: Wed, 2 Sep 2015 14:35:23 +0200
|
|
|
e4ffb1 |
Subject: [PATCH 1/3] fence_ipmilan: Restore deprecated option -i which is
|
|
|
e4ffb1 |
alias to -a / --ip
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
Resolves: rhbz#1257137
|
|
|
e4ffb1 |
---
|
|
|
e4ffb1 |
fence/agents/ipmilan/fence_ipmilan.py | 16 +++++++++++++---
|
|
|
e4ffb1 |
1 file changed, 13 insertions(+), 3 deletions(-)
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
diff --git a/fence/agents/ipmilan/fence_ipmilan.py b/fence/agents/ipmilan/fence_ipmilan.py
|
|
|
e4ffb1 |
index 8490837..8224b83 100644
|
|
|
e4ffb1 |
--- a/fence/agents/ipmilan/fence_ipmilan.py
|
|
|
e4ffb1 |
+++ b/fence/agents/ipmilan/fence_ipmilan.py
|
|
|
e4ffb1 |
@@ -119,12 +119,18 @@ def define_new_opts():
|
|
|
e4ffb1 |
"default" : "@IPMITOOL_PATH@",
|
|
|
e4ffb1 |
"order": 200
|
|
|
e4ffb1 |
}
|
|
|
e4ffb1 |
+ all_opt["obsolete_ip"] = {
|
|
|
e4ffb1 |
+ "getopt" : "i:",
|
|
|
e4ffb1 |
+ "longopt" : "obsolete-ip",
|
|
|
e4ffb1 |
+ "help" : "",
|
|
|
e4ffb1 |
+ "order" : 1
|
|
|
e4ffb1 |
+ }
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
def main():
|
|
|
e4ffb1 |
atexit.register(atexit_handler)
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
- device_opt = ["ipaddr", "login", "no_login", "no_password", "passwd",
|
|
|
e4ffb1 |
- "lanplus", "auth", "cipher", "privlvl", "sudo", "ipmitool_path", "method"]
|
|
|
e4ffb1 |
+ device_opt = ["ipaddr", "ipport", "login", "no_login", "no_password", "passwd",
|
|
|
e4ffb1 |
+ "lanplus", "auth", "cipher", "privlvl", "sudo", "ipmitool_path", "method", "obsolete_ip"]
|
|
|
e4ffb1 |
define_new_opts()
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
if os.path.basename(sys.argv[0]) == "fence_ilo3":
|
|
|
e4ffb1 |
@@ -136,7 +142,11 @@ def main():
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
all_opt["ipport"]["default"] = "623"
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
- options = check_input(device_opt, process_input(device_opt))
|
|
|
e4ffb1 |
+ pi = process_input(device_opt)
|
|
|
e4ffb1 |
+ # Accept also deprecated option but do not propagate it at all
|
|
|
e4ffb1 |
+ if "--obsolete-ip" in pi:
|
|
|
e4ffb1 |
+ pi["--ip"] = pi["--obsolete-ip"]
|
|
|
e4ffb1 |
+ options = check_input(device_opt, pi)
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
docs = {}
|
|
|
e4ffb1 |
docs["shortdesc"] = "Fence agent for IPMI"
|
|
|
e4ffb1 |
--
|
|
|
e4ffb1 |
1.9.3
|
|
|
e4ffb1 |
|