This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
fence-agents: master - fence: Change force_ipvX to inetX_only
- From: Jan Friesse <honzaf at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 22 Apr 2009 14:41:45 +0000 (UTC)
- Subject: fence-agents: master - fence: Change force_ipvX to inetX_only
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=70d4bf4110548b71ad987b1272dd3d4af43108d9
Commit: 70d4bf4110548b71ad987b1272dd3d4af43108d9
Parent: a329ebc8e999efbcec0040112156702e3c8e7acb
Author: Jan Friesse <jfriesse@redhat.com>
AuthorDate: Wed Apr 22 16:41:02 2009 +0200
Committer: Jan Friesse <jfriesse@redhat.com>
CommitterDate: Wed Apr 22 16:41:02 2009 +0200
fence: Change force_ipvX to inetX_only
Patch changes long option and XML option in cluster.conf from
force_ipvX to inetX_only. It's because force something doesn't
sound very nice. Short option -4/-6 still works.
Idea of inetX_only is taken from wget, so users shouldn't be
confused.
---
fence/agents/alom/fence_alom.py | 2 +-
fence/agents/apc/fence_apc.py | 2 +-
fence/agents/apc_snmp/fence_apc_snmp.py | 2 +-
fence/agents/bladecenter/fence_bladecenter.py | 2 +-
fence/agents/cisco_mds/fence_cisco_mds.py | 2 +-
fence/agents/drac/fence_drac5.py | 2 +-
fence/agents/ibmblade/fence_ibmblade.py | 2 +-
fence/agents/ifmib/fence_ifmib.py | 2 +-
fence/agents/ilo/fence_ilo.py | 2 +-
fence/agents/intelmodular/fence_intelmodular.py | 2 +-
fence/agents/ldom/fence_ldom.py | 2 +-
fence/agents/lib/fencing.py.py | 12 ++++++------
fence/agents/lpar/fence_lpar.py | 2 +-
fence/agents/virsh/fence_virsh.py | 2 +-
fence/agents/wti/fence_wti.py | 2 +-
15 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py
index 0a1de93..e1632cc 100644
--- a/fence/agents/alom/fence_alom.py
+++ b/fence/agents/alom/fence_alom.py
@@ -45,7 +45,7 @@ def set_power_status(conn, options):
def main():
device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd", "passwd_script",
- "secure", "test", "force_ipv4", "force_ipv6" ]
+ "secure", "test", "inet4_only", "inet6_only" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
index 9fa3ec6..e230eaf 100755
--- a/fence/agents/apc/fence_apc.py
+++ b/fence/agents/apc/fence_apc.py
@@ -185,7 +185,7 @@ def main():
device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd", "passwd_script",
"secure", "port", "switch", "test", "separator",
- "force_ipv4", "force_ipv6" ]
+ "inet4_only", "inet6_only" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py
index 3007b2d..6ff1318 100644
--- a/fence/agents/apc_snmp/fence_apc_snmp.py
+++ b/fence/agents/apc_snmp/fence_apc_snmp.py
@@ -169,7 +169,7 @@ def main():
"test", "port", "separator", "no_login", "no_password",
"snmp_version", "community", "snmp_auth_prot", "snmp_sec_level",
"snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script",
- "udpport","force_ipv4","force_ipv6"]
+ "udpport","inet4_only","inet6_only"]
atexit.register(atexit_handler)
diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py
index fc88656..f8882a0 100644
--- a/fence/agents/bladecenter/fence_bladecenter.py
+++ b/fence/agents/bladecenter/fence_bladecenter.py
@@ -91,7 +91,7 @@ def main():
device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd", "passwd_script",
"cmd_prompt", "secure", "port", "identity_file", "separator",
- "force_ipv4", "force_ipv6" ]
+ "inet4_only", "inet6_only" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py
index 5d910dd..0d57c04 100644
--- a/fence/agents/cisco_mds/fence_cisco_mds.py
+++ b/fence/agents/cisco_mds/fence_cisco_mds.py
@@ -86,7 +86,7 @@ def main():
"test", "port", "separator", "no_login", "no_password",
"snmp_version", "community", "snmp_auth_prot", "snmp_sec_level",
"snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script",
- "udpport","force_ipv4","force_ipv6"]
+ "udpport","inet4_only","inet6_only"]
atexit.register(atexit_handler)
diff --git a/fence/agents/drac/fence_drac5.py b/fence/agents/drac/fence_drac5.py
index 6519487..568b6ae 100755
--- a/fence/agents/drac/fence_drac5.py
+++ b/fence/agents/drac/fence_drac5.py
@@ -52,7 +52,7 @@ def main():
device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd", "passwd_script",
"cmd_prompt", "secure",
- "drac_version", "module_name", "force_ipv4", "force_ipv6" ]
+ "drac_version", "module_name", "inet4_only", "inet6_only" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py
index 811d311..e6d0dac 100644
--- a/fence/agents/ibmblade/fence_ibmblade.py
+++ b/fence/agents/ibmblade/fence_ibmblade.py
@@ -61,7 +61,7 @@ def main():
"test", "port", "separator", "no_login", "no_password",
"snmp_version", "community", "snmp_auth_prot", "snmp_sec_level",
"snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script",
- "udpport","force_ipv4","force_ipv6"]
+ "udpport","inet4_only","inet6_only"]
atexit.register(atexit_handler)
diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py
index d5d193f..7473129 100644
--- a/fence/agents/ifmib/fence_ifmib.py
+++ b/fence/agents/ifmib/fence_ifmib.py
@@ -106,7 +106,7 @@ def main():
"test", "port", "separator", "no_login", "no_password",
"snmp_version", "community", "snmp_auth_prot", "snmp_sec_level",
"snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script",
- "udpport","force_ipv4","force_ipv6"]
+ "udpport","inet4_only","inet6_only"]
atexit.register(atexit_handler)
diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
index 19d04db..2b7cb85 100755
--- a/fence/agents/ilo/fence_ilo.py
+++ b/fence/agents/ilo/fence_ilo.py
@@ -56,7 +56,7 @@ def set_power_status(conn, options):
def main():
device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd", "passwd_script",
- "ssl", "ribcl", "force_ipv4", "force_ipv6" ]
+ "ssl", "ribcl", "inet4_only", "inet6_only" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py
index 0ac86dc..157d0a2 100644
--- a/fence/agents/intelmodular/fence_intelmodular.py
+++ b/fence/agents/intelmodular/fence_intelmodular.py
@@ -72,7 +72,7 @@ def main():
"test", "port", "separator", "no_login", "no_password",
"snmp_version", "community", "snmp_auth_prot", "snmp_sec_level",
"snmp_priv_prot", "snmp_priv_passwd", "snmp_priv_passwd_script",
- "udpport","force_ipv4","force_ipv6"]
+ "udpport","inet4_only","inet6_only"]
atexit.register(atexit_handler)
diff --git a/fence/agents/ldom/fence_ldom.py b/fence/agents/ldom/fence_ldom.py
index 07f90ca..683e54f 100644
--- a/fence/agents/ldom/fence_ldom.py
+++ b/fence/agents/ldom/fence_ldom.py
@@ -84,7 +84,7 @@ def main():
device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd", "passwd_script",
"secure", "identity_file", "test" , "port", "cmd_prompt",
- "separator", "force_ipv4", "force_ipv6" ]
+ "separator", "inet4_only", "inet6_only" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index a4d666f..a08acf5 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -257,17 +257,17 @@ all_opt = {
"required" : "0",
"shortdesc" : "Script to run to retrieve privacy password",
"order" : 1},
- "force_ipv4" : {
+ "inet4_only" : {
"getopt" : "4",
- "longopt" : "force-ipv4",
- "help" : "-4, --force-ipv4 Forces agent to use IPv4 addresses only",
+ "longopt" : "inet4-only",
+ "help" : "-4, --inet4-only Forces agent to use IPv4 addresses only",
"required" : "0",
"shortdesc" : "Forces agent to use IPv4 addresses only",
"order" : 1 },
- "force_ipv6" : {
+ "inet6_only" : {
"getopt" : "6",
- "longopt" : "force-ipv6",
- "help" : "-6, --force-ipv6 Forces agent to use IPv6 addresses only",
+ "longopt" : "inet6-only",
+ "help" : "-6, --inet6-only Forces agent to use IPv6 addresses only",
"required" : "0",
"shortdesc" : "Forces agent to use IPv6 addresses only",
"order" : 1 },
diff --git a/fence/agents/lpar/fence_lpar.py b/fence/agents/lpar/fence_lpar.py
index 505e21c..df447b7 100644
--- a/fence/agents/lpar/fence_lpar.py
+++ b/fence/agents/lpar/fence_lpar.py
@@ -133,7 +133,7 @@ def main():
device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd", "passwd_script",
"secure", "partition", "managed", "hmc_version", "cmd_prompt",
- "separator", "force_ipv4", "force_ipv6" ]
+ "separator", "inet4_only", "inet6_only" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/virsh/fence_virsh.py b/fence/agents/virsh/fence_virsh.py
index 6e7e291..3eeb4be 100644
--- a/fence/agents/virsh/fence_virsh.py
+++ b/fence/agents/virsh/fence_virsh.py
@@ -63,7 +63,7 @@ def main():
device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd", "passwd_script",
"secure", "identity_file", "test", "port", "separator",
- "force_ipv4", "force_ipv6" ]
+ "inet4_only", "inet6_only" ]
atexit.register(atexit_handler)
diff --git a/fence/agents/wti/fence_wti.py b/fence/agents/wti/fence_wti.py
index d11d3b1..7ef5868 100644
--- a/fence/agents/wti/fence_wti.py
+++ b/fence/agents/wti/fence_wti.py
@@ -76,7 +76,7 @@ def main():
device_opt = [ "help", "version", "agent", "quiet", "verbose", "debug",
"action", "ipaddr", "login", "passwd", "passwd_script",
"cmd_prompt", "secure", "port", "no_login", "no_password",
- "test", "separator", "force_ipv4", "force_ipv6" ]
+ "test", "separator", "inet4_only", "inet6_only" ]
atexit.register(atexit_handler)