cluster: RHEL6 - ccs_tool: completely remove references to update/upgrades

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 6a4d7838acced508d1a30f1343b79d616b9b4a99 Parent: ca38fb4ad8caaf1f670fb0c7aedf08baae8e3a84 Author: Fabio M. Di Nitto <fdinitto(a)redhat.com&gt; AuthorDate: Thu Jan 6 10:58:23 2011 +0100 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com&gt; CommitterDate: Wed Jan 12 16:15:53 2011 +0100 ccs_tool: completely remove references to update/upgrades Drop parsing of CF options and update man page to better reflect what ccs_tool is and does. Resolves: rhbz#577874 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com&gt; --- config/tools/ccs_tool/editconf.c | 8 ++++---- config/tools/man/ccs_tool.8 | 37 ++++++++----------------------------- 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/config/tools/ccs_tool/editconf.c b/config/tools/ccs_tool/editconf.c index a0371b4..7971672 100644 --- a/config/tools/ccs_tool/editconf.c +++ b/config/tools/ccs_tool/editconf.c @@ -783,7 +783,7 @@ void add_node(int argc, char **argv) memset(&ninfo, 0, sizeof(ninfo)); ninfo.votes = "1"; - while ( (opt = getopt_long(argc, argv, "v:n:a:f:o:c:CFh?", addnode_options, NULL)) != EOF) + while ( (opt = getopt_long(argc, argv, "v:n:a:f:o:c:h?", addnode_options, NULL)) != EOF) { switch(opt) { @@ -849,7 +849,7 @@ void del_node(int argc, char **argv) memset(&ninfo, 0, sizeof(ninfo)); - while ( (opt = getopt_long(argc, argv, "o:c:CFh?", delnode_options, NULL)) != EOF) + while ( (opt = getopt_long(argc, argv, "o:c:h?", delnode_options, NULL)) != EOF) { switch(opt) { @@ -1072,7 +1072,7 @@ void add_fence(int argc, char **argv) memset(&ninfo, 0, sizeof(ninfo)); - while ( (opt = getopt_long(argc, argv, "c:o:CFh?", list_options, NULL)) != EOF) + while ( (opt = getopt_long(argc, argv, "c:o:h?", list_options, NULL)) != EOF) { switch(opt) { @@ -1134,7 +1134,7 @@ void del_fence(int argc, char **argv) memset(&ninfo, 0, sizeof(ninfo)); - while ( (opt = getopt_long(argc, argv, "c:o:CFhv?", list_options, NULL)) != EOF) + while ( (opt = getopt_long(argc, argv, "c:o:hv?", list_options, NULL)) != EOF) { switch(opt) { diff --git a/config/tools/man/ccs_tool.8 b/config/tools/man/ccs_tool.8 index dd409e4..0f52f18 100644 --- a/config/tools/man/ccs_tool.8 +++ b/config/tools/man/ccs_tool.8 @@ -1,6 +1,6 @@ .TH "ccs_tool" "8" "" "" "" .SH "NAME" -ccs_tool \- The tool used to make online updates of CCS config files. +ccs_tool \- The tool used to make online queries to the cluster configuration. .SH "SYNOPSIS" .B ccs_tool @@ -8,10 +8,9 @@ ccs_tool \- The tool used to make online updates of CCS config files. .SH "DESCRIPTION" -\fBccs_tool\fP is part of the Cluster Configuration System (CCS). It is -used to make online updates to cluster.conf. It can also be used to -upgrade old style (GFS <= 6.0) CCS archives to the new xml cluster.conf -format. +\fBccs_tool\fP is part of the Cluster Configuration System (CCS). It used +to peform different kind of queries to the cluster configuration and has support +for some cluster.conf editing functions. .SH "OPTIONS" .TP @@ -24,6 +23,10 @@ Print the version information. sub\-commands have their own options, see below for more detail .SH "COMMANDS" +.TP +\fBquery\fP \fI<xpath query>\fP +Perform an xpath query on running cluster configuration. + .TP \fBaddnode\fP [options] \fI<node> [<fenceoption=value>]...\fP Adds a new node to the cluster configuration file. Fencing device options @@ -51,12 +54,6 @@ section must already have been added to the file, probably using the addfence co \-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf .br \-o <file> Output file. Defaults to the same as -c -.br -\-C Don't run "ccs_tool update" after changing file. This will -happen by default if the input file is the same as the output file. -.br -\-F Force a "ccs_tool update" even if the input and output files -are different. @@ -71,12 +68,6 @@ and add it back in with the new properties. \-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf .br \-o <file> Output file. Defaults to the same as -c -.br -\-C Don't run "ccs_tool update" after changing file. This will -happen by default if the input file is the same as the output file. -.br -\-F Force a "ccs_tool update" even if the input and output files -are different. @@ -93,12 +84,6 @@ device. \-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf .br \-o <file> Output file. Defaults to the same as -c -.br -\-C Don't run "ccs_tool update" after changing file. This will -happen by default if the input file is the same as the output file. -.br -\-F Force a "ccs_tool update" even if the input and output files -are different. .TP \fBdelfence\fP [options] \fI<node>\fP @@ -112,12 +97,6 @@ invalid configuration file if you don't add it back in again. \-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf .br \-o <file> Output file. Defaults to the same as -c -.br -\-C Don't run "ccs_tool update" after changing file. This will -happen by default if the input file is the same as the output file. -.br -\-F Force a "ccs_tool update" even if the input and output files -are different. .TP