Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=64e259c27... Commit: 64e259c2754c881e95c4e3ec902b26ceb0be9820 Parent: 8e1cef5a2b341763738170393fb093313b16e93f Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Thu Nov 13 17:04:15 2014 +0100 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Thu Nov 13 17:04:15 2014 +0100
fencing: Improve accessibility of possible connection (+telnet,+web)
'web' was previously not set properly on each fence agent 'telnet' is completely new option --- fence/agents/apc/fence_apc.py | 2 +- fence/agents/bladecenter/fence_bladecenter.py | 2 +- fence/agents/brocade/fence_brocade.py | 3 ++- fence/agents/drac/fence_drac.py | 2 +- fence/agents/drac5/fence_drac5.py | 2 +- fence/agents/hds_cb/fence_hds_cb.py | 2 +- fence/agents/hpblade/fence_hpblade.py | 3 ++- fence/agents/ilo_mp/fence_ilo_mp.py | 2 +- fence/agents/ilo_ssh/fence_ilo_ssh.py | 2 +- fence/agents/lib/fencing.py.py | 4 ++++ fence/agents/netio/fence_netio.py | 2 +- fence/agents/ovh/fence_ovh.py | 2 +- fence/agents/raritan/fence_raritan.py | 2 +- fence/agents/rsa/fence_rsa.py | 2 +- fence/agents/rsb/fence_rsb.py | 2 +- fence/agents/sanbox2/fence_sanbox2.py | 3 ++- fence/agents/wti/fence_wti.py | 2 +- fence/agents/xenapi/fence_xenapi.py | 2 +- 18 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py index f2080f1..d11bd84 100644 --- a/fence/agents/apc/fence_apc.py +++ b/fence/agents/apc/fence_apc.py @@ -212,7 +212,7 @@ def set_power_status5(conn, options):
def main(): device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", \ - "port", "switch"] + "port", "switch", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py index 8bc6949..9dc71e9 100644 --- a/fence/agents/bladecenter/fence_bladecenter.py +++ b/fence/agents/bladecenter/fence_bladecenter.py @@ -81,7 +81,7 @@ def get_blades_list(conn, options):
def main(): device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", \ - "port", "missing_as_off"] + "port", "missing_as_off", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/brocade/fence_brocade.py b/fence/agents/brocade/fence_brocade.py index 3e5dd93..54c5920 100644 --- a/fence/agents/brocade/fence_brocade.py +++ b/fence/agents/brocade/fence_brocade.py @@ -43,7 +43,8 @@ def get_power_status(conn, options): return outlets
def main(): - device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", "port", "fabric_fencing"] + device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", \ + "port", "fabric_fencing", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/drac/fence_drac.py b/fence/agents/drac/fence_drac.py index da522a3..4428fb7 100644 --- a/fence/agents/drac/fence_drac.py +++ b/fence/agents/drac/fence_drac.py @@ -27,7 +27,7 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
def main(): - device_opt = ["ipaddr", "login", "passwd", "cmd_prompt"] + device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py index 424fe53..0c9ced6 100644 --- a/fence/agents/drac5/fence_drac5.py +++ b/fence/agents/drac5/fence_drac5.py @@ -104,7 +104,7 @@ def define_new_opts():
def main(): device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", \ - "drac_version", "port", "no_port"] + "drac_version", "port", "no_port", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/hds_cb/fence_hds_cb.py b/fence/agents/hds_cb/fence_hds_cb.py index c661fe2..b3d725a 100755 --- a/fence/agents/hds_cb/fence_hds_cb.py +++ b/fence/agents/hds_cb/fence_hds_cb.py @@ -108,7 +108,7 @@ def get_blades_list(conn, options):
def main(): device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", \ - "port", "missing_as_off"] + "port", "missing_as_off", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/hpblade/fence_hpblade.py b/fence/agents/hpblade/fence_hpblade.py index e0b8866..118dd7f 100644 --- a/fence/agents/hpblade/fence_hpblade.py +++ b/fence/agents/hpblade/fence_hpblade.py @@ -59,7 +59,8 @@ def get_blades_list(conn, options): return outlets
def main(): - device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", "port", "missing_as_off"] + device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", \ + "port", "missing_as_off", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py index b84c924..7195bdd 100644 --- a/fence/agents/ilo_mp/fence_ilo_mp.py +++ b/fence/agents/ilo_mp/fence_ilo_mp.py @@ -35,7 +35,7 @@ def set_power_status(conn, options): return
def main(): - device_opt = ["ipaddr", "login", "passwd", "secure", "cmd_prompt"] + device_opt = ["ipaddr", "login", "passwd", "secure", "cmd_prompt", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/ilo_ssh/fence_ilo_ssh.py b/fence/agents/ilo_ssh/fence_ilo_ssh.py index f75ac25..2fc9de2 100644 --- a/fence/agents/ilo_ssh/fence_ilo_ssh.py +++ b/fence/agents/ilo_ssh/fence_ilo_ssh.py @@ -40,7 +40,7 @@ def reboot_cycle(conn, options): return
def main(): - device_opt = ["ipaddr", "login", "passwd", "secure", "cmd_prompt", "method"] + device_opt = ["ipaddr", "login", "passwd", "secure", "cmd_prompt", "method", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 098f19e..b74c888 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -130,6 +130,10 @@ all_opt = { "getopt" : "", "help" : "", "order" : 1}, + "telnet" : { + "getopt" : "", + "help" : "", + "order" : ""}, "passwd" : { "getopt" : "p:", "longopt" : "password", diff --git a/fence/agents/netio/fence_netio.py b/fence/agents/netio/fence_netio.py index b14b454..e33b724 100755 --- a/fence/agents/netio/fence_netio.py +++ b/fence/agents/netio/fence_netio.py @@ -53,7 +53,7 @@ def get_outlet_list(conn, options): return result
def main(): - device_opt = ["ipaddr", "login", "passwd", "port"] + device_opt = ["ipaddr", "login", "passwd", "port", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/ovh/fence_ovh.py b/fence/agents/ovh/fence_ovh.py index fa23969..55675db 100644 --- a/fence/agents/ovh/fence_ovh.py +++ b/fence/agents/ovh/fence_ovh.py @@ -77,7 +77,7 @@ def remove_tmp_dir(tmp_dir): shutil.rmtree(tmp_dir)
def main(): - device_opt = ["login", "passwd", "port", "email", "no_status"] + device_opt = ["login", "passwd", "port", "email", "no_status", "web"]
atexit.register(atexit_handler)
diff --git a/fence/agents/raritan/fence_raritan.py b/fence/agents/raritan/fence_raritan.py index bb6ad52..446de08 100644 --- a/fence/agents/raritan/fence_raritan.py +++ b/fence/agents/raritan/fence_raritan.py @@ -36,7 +36,7 @@ def set_power_status(conn, options): conn.send_eol("set %s powerState=%s" % (options["--plug"], action))
def main(): - device_opt = ["ipaddr", "login", "passwd", "port"] + device_opt = ["ipaddr", "login", "passwd", "port", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/rsa/fence_rsa.py b/fence/agents/rsa/fence_rsa.py index fcf5fb9..6bb4989 100644 --- a/fence/agents/rsa/fence_rsa.py +++ b/fence/agents/rsa/fence_rsa.py @@ -35,7 +35,7 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--power-timeout"]))
def main(): - device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure"] + device_opt = ["ipaddr", "login", "passwd", "cmd_prompt", "secure", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/rsb/fence_rsb.py b/fence/agents/rsb/fence_rsb.py index d21093f..0058ac8 100755 --- a/fence/agents/rsb/fence_rsb.py +++ b/fence/agents/rsb/fence_rsb.py @@ -39,7 +39,7 @@ def set_power_status(conn, options): conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))
def main(): - device_opt = ["ipaddr", "login", "passwd", "secure", "cmd_prompt"] + device_opt = ["ipaddr", "login", "passwd", "secure", "cmd_prompt", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/sanbox2/fence_sanbox2.py b/fence/agents/sanbox2/fence_sanbox2.py index 2b385b7..1a041cf 100644 --- a/fence/agents/sanbox2/fence_sanbox2.py +++ b/fence/agents/sanbox2/fence_sanbox2.py @@ -104,7 +104,8 @@ def get_list_devices(conn, options): return outlets
def main(): - device_opt = ["fabric_fencing", "ipaddr", "login", "passwd", "cmd_prompt", "port"] + device_opt = ["fabric_fencing", "ipaddr", "login", "passwd", "cmd_prompt", \ + "port", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py index 86f9a4d..870b5a2 100644 --- a/fence/agents/wti/fence_wti.py +++ b/fence/agents/wti/fence_wti.py @@ -179,7 +179,7 @@ def set_power_status(conn, options):
def main(): device_opt = ["ipaddr", "login", "passwd", "no_login", "no_password", \ - "cmd_prompt", "secure", "port"] + "cmd_prompt", "secure", "port", "telnet"]
atexit.register(atexit_handler)
diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py index 655831e..5fe7646 100644 --- a/fence/agents/xenapi/fence_xenapi.py +++ b/fence/agents/xenapi/fence_xenapi.py @@ -199,7 +199,7 @@ def return_vm_reference(session, options):
def main():
- device_opt = ["login", "passwd", "port", "no_login", "no_password", "session_url"] + device_opt = ["login", "passwd", "port", "no_login", "no_password", "session_url", "web"]
atexit.register(atexit_handler)