Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=141d2e6d8... Commit: 141d2e6d8310e22fa5f678d46089146dfa4691b0 Parent: 9049b8e08dbf93dbaa7507dedb7d36067852c011 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Mon Feb 4 16:30:55 2013 +0100 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Mon Feb 4 16:30:55 2013 +0100
fencing: Text in help is changed from foo=<value> to foo=[value]
--- fence/agents/lib/fencing.py.py | 58 ++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 5bf98e2..98e8fd2 100644 --- a/fence/agents/lib/fencing.py.py +++ b/fence/agents/lib/fencing.py.py @@ -55,14 +55,14 @@ all_opt = { "debug" : { "getopt" : "D:", "longopt" : "debug-file", - "help" : "-D, --debug-file=<debugfile> Debugging to output file", + "help" : "-D, --debug-file=[debugfile] Debugging to output file", "required" : "0", "shortdesc" : "Write debug information to given file", "order" : 52 }, "delay" : { "getopt" : "f:", "longopt" : "delay", - "help" : "--delay <seconds> Wait X seconds before fencing is started", + "help" : "--delay=[seconds] Wait X seconds before fencing is started", "required" : "0", "shortdesc" : "Wait X seconds before fencing is started", "default" : "0", @@ -78,7 +78,7 @@ all_opt = { "action" : { "getopt" : "o:", "longopt" : "action", - "help" : "-o, --action=<action> Action: status, reboot (default), off or on", + "help" : "-o, --action=[action] Action: status, reboot (default), off or on", "required" : "1", "shortdesc" : "Fencing Action", "default" : "reboot", @@ -90,21 +90,21 @@ all_opt = { "ipaddr" : { "getopt" : "a:", "longopt" : "ip", - "help" : "-a, --ip=<ip> IP address or hostname of fencing device", + "help" : "-a, --ip=[ip] IP address or hostname of fencing device", "required" : "1", "shortdesc" : "IP Address or Hostname", "order" : 1 }, "ipport" : { "getopt" : "u:", "longopt" : "ipport", - "help" : "-u, --ipport=<port> TCP/UDP port to use", + "help" : "-u, --ipport=[port] TCP/UDP port to use", "required" : "0", "shortdesc" : "TCP/UDP port to use for connection with device", "order" : 1 }, "login" : { "getopt" : "l:", "longopt" : "username", - "help" : "-l, --username=<name> Login name", + "help" : "-l, --username=[name] Login name", "required" : "?", "shortdesc" : "Login Name", "order" : 1 }, @@ -123,35 +123,35 @@ all_opt = { "passwd" : { "getopt" : "p:", "longopt" : "password", - "help" : "-p, --password=<password> Login password or passphrase", + "help" : "-p, --password=[password] Login password or passphrase", "required" : "0", "shortdesc" : "Login password or passphrase", "order" : 1 }, "passwd_script" : { "getopt" : "S:", "longopt" : "password-script", - "help" : "-S, --password-script=<script> Script to run to retrieve password", + "help" : "-S, --password-script=[script] Script to run to retrieve password", "required" : "0", "shortdesc" : "Script to retrieve password", "order" : 1 }, "identity_file" : { "getopt" : "k:", "longopt" : "identity-file", - "help" : "-k, --identity-file=<filename> Identity file (private key) for ssh ", + "help" : "-k, --identity-file=[filename] Identity file (private key) for ssh ", "required" : "0", "shortdesc" : "Identity file for ssh", "order" : 1 }, "drac_version" : { "getopt" : "d:", "longopt" : "drac-version", - "help" : "-d, --drac-version=<version> Force DRAC version to use", + "help" : "-d, --drac-version=[version] Force DRAC version to use", "required" : "0", "shortdesc" : "Force DRAC version to use", "order" : 1 }, "cmd_prompt" : { "getopt" : "c:", "longopt" : "command-prompt", - "help" : "-c, --command-prompt=<prompt> Force command prompt", + "help" : "-c, --command-prompt=[prompt] Force command prompt", "shortdesc" : "Force command prompt", "required" : "0", "order" : 1 }, @@ -165,7 +165,7 @@ all_opt = { "ssh_options" : { "getopt" : "X:", "longopt" : "ssh-options", - "help" : "--ssh-options=<options> SSH options to use", + "help" : "--ssh-options=[options] SSH options to use", "shortdesc" : "SSH options to use", "required" : "0", "order" : 1 }, @@ -179,7 +179,7 @@ all_opt = { "port" : { "getopt" : "n:", "longopt" : "plug", - "help" : "-n, --plug=<id> Physical plug number on device, UUID or\n" + + "help" : "-n, --plug=[id] Physical plug number on device, UUID or\n" + " identification of machine", "required" : "1", "shortdesc" : "Physical plug number, name of virtual machine or UUID", @@ -187,56 +187,56 @@ all_opt = { "switch" : { "getopt" : "s:", "longopt" : "switch", - "help" : "-s, --switch=<id> Physical switch number on device", + "help" : "-s, --switch=[id] Physical switch number on device", "required" : "0", "shortdesc" : "Physical switch number on device", "order" : 1 }, "exec" : { "getopt" : "e:", "longopt" : "exec", - "help" : "-e, --exec=<command> Command to execute", + "help" : "-e, --exec=[command] Command to execute", "required" : "0", "shortdesc" : "Command to execute", "order" : 1 }, "vmware_type" : { "getopt" : "d:", "longopt" : "vmware_type", - "help" : "-d, --vmware_type=<type> Type of VMware to connect", + "help" : "-d, --vmware_type=[type] Type of VMware to connect", "required" : "0", "shortdesc" : "Type of VMware to connect", "order" : 1 }, "vmware_datacenter" : { "getopt" : "s:", "longopt" : "vmware-datacenter", - "help" : "-s, --vmware-datacenter=<dc> VMWare datacenter filter", + "help" : "-s, --vmware-datacenter=[dc] VMWare datacenter filter", "required" : "0", "shortdesc" : "Show only machines in specified datacenter", "order" : 2 }, "snmp_version" : { "getopt" : "d:", "longopt" : "snmp-version", - "help" : "-d, --snmp-version=<ver> Specifies SNMP version to use", + "help" : "-d, --snmp-version=[version] Specifies SNMP version to use", "required" : "0", "shortdesc" : "Specifies SNMP version to use (1,2c,3)", "order" : 1 }, "community" : { "getopt" : "c:", "longopt" : "community", - "help" : "-c, --community=<community> Set the community string", + "help" : "-c, --community=[community] Set the community string", "required" : "0", "shortdesc" : "Set the community string", "order" : 1}, "snmp_auth_prot" : { "getopt" : "b:", "longopt" : "snmp-auth-prot", - "help" : "-b, --snmp-auth-prot=<prot> Set authentication protocol (MD5|SHA)", + "help" : "-b, --snmp-auth-prot=[prot] Set authentication protocol (MD5|SHA)", "required" : "0", "shortdesc" : "Set authentication protocol (MD5|SHA)", "order" : 1}, "snmp_sec_level" : { "getopt" : "E:", "longopt" : "snmp-sec-level", - "help" : "-E, --snmp-sec-level=<level> Set security level\n"+ + "help" : "-E, --snmp-sec-level=[level] Set security level\n"+ " (noAuthNoPriv|authNoPriv|authPriv)", "required" : "0", "shortdesc" : "Set security level (noAuthNoPriv|authNoPriv|authPriv)", @@ -244,14 +244,14 @@ all_opt = { "snmp_priv_prot" : { "getopt" : "B:", "longopt" : "snmp-priv-prot", - "help" : "-B, --snmp-priv-prot=<prot> Set privacy protocol (DES|AES)", + "help" : "-B, --snmp-priv-prot=[prot] Set privacy protocol (DES|AES)", "required" : "0", "shortdesc" : "Set privacy protocol (DES|AES)", "order" : 1}, "snmp_priv_passwd" : { "getopt" : "P:", "longopt" : "snmp-priv-passwd", - "help" : "-P, --snmp-priv-passwd=<pass> Set privacy protocol password", + "help" : "-P, --snmp-priv-passwd=[pass] Set privacy protocol password", "required" : "0", "shortdesc" : "Set privacy protocol password", "order" : 1}, @@ -279,7 +279,7 @@ all_opt = { "separator" : { "getopt" : "C:", "longopt" : "separator", - "help" : "-C, --separator=<char> Separator for CSV created by 'list' operation", + "help" : "-C, --separator=[char] Separator for CSV created by 'list' operation", "default" : ",", "required" : "0", "shortdesc" : "Separator for CSV created by operation list", @@ -287,7 +287,7 @@ all_opt = { "login_timeout" : { "getopt" : "y:", "longopt" : "login-timeout", - "help" : "--login-timeout <seconds> Wait X seconds for cmd prompt after login", + "help" : "--login-timeout=[seconds] Wait X seconds for cmd prompt after login", "default" : "5", "required" : "0", "shortdesc" : "Wait X seconds for cmd prompt after login", @@ -295,7 +295,7 @@ all_opt = { "shell_timeout" : { "getopt" : "Y:", "longopt" : "shell-timeout", - "help" : "--shell-timeout <seconds> Wait X seconds for cmd prompt after issuing command", + "help" : "--shell-timeout=[seconds] Wait X seconds for cmd prompt after issuing command", "default" : "3", "required" : "0", "shortdesc" : "Wait X seconds for cmd prompt after issuing command", @@ -303,7 +303,7 @@ all_opt = { "power_timeout" : { "getopt" : "g:", "longopt" : "power-timeout", - "help" : "--power-timeout <seconds> Test X seconds for status change after ON/OFF", + "help" : "--power-timeout=[seconds] Test X seconds for status change after ON/OFF", "default" : "20", "required" : "0", "shortdesc" : "Test X seconds for status change after ON/OFF", @@ -311,7 +311,7 @@ all_opt = { "power_wait" : { "getopt" : "G:", "longopt" : "power-wait", - "help" : "--power-wait <seconds> Wait X seconds after issuing ON/OFF", + "help" : "--power-wait=[seconds] Wait X seconds after issuing ON/OFF", "default" : "0", "required" : "0", "shortdesc" : "Wait X seconds after issuing ON/OFF", @@ -326,7 +326,7 @@ all_opt = { "retry_on" : { "getopt" : "F:", "longopt" : "retry-on", - "help" : "--retry-on <attempts> Count of attempts to retry power on", + "help" : "--retry-on=[attempts] Count of attempts to retry power on", "default" : "1", "required" : "0", "shortdesc" : "Count of attempts to retry power on",
cluster-commits@lists.fedorahosted.org