From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7064 invoked by alias); 8 Jun 2009 08:50:57 -0000 Received: (qmail 7057 invoked by alias); 8 Jun 2009 08:50:56 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - cman: Remove references to ccs in the man pages To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 285eb8c2ac20e92131a0b0209587c800c2d7aed4 X-Git-Newrev: 9e136f15ea1e6f46bc46317f3f2f9c5504b462b9 From: Christine Caulfield Message-Id: <20090608085024.AEB19120375@lists.fedorahosted.org> Date: Mon, 08 Jun 2009 08:50:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q2/txt/msg00476.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=9e136f15ea1e6f46bc46317f3f2f9c5504b462b9 Commit: 9e136f15ea1e6f46bc46317f3f2f9c5504b462b9 Parent: 285eb8c2ac20e92131a0b0209587c800c2d7aed4 Author: Christine Caulfield AuthorDate: Mon Jun 8 09:49:54 2009 +0100 Committer: Christine Caulfield CommitterDate: Mon Jun 8 09:49:54 2009 +0100 cman: Remove references to ccs in the man pages Signed-off-by: Christine Caulfield --- cman/man/cman.5 | 4 ++-- cman/man/cman_tool.8 | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cman/man/cman.5 b/cman/man/cman.5 index 7fff53d..061ba05 100644 --- a/cman/man/cman.5 +++ b/cman/man/cman.5 @@ -161,7 +161,7 @@ traffic. .in +7 When corosync is started by cman (cman_tool runs corosync), the corosync.conf file is not used. Many of the configuration parameters listed in -corosync.conf can be set in cluster.conf (CCS) instead. Cman will read +corosync.conf can be set in cluster.conf instead. Cman will read corosync parameters from the following sections in cluster.conf and load them into corosync: @@ -218,5 +218,5 @@ And this is how to add extra corosync logging options to CMAN and CPG: .SH "SEE ALSO" -cluster.conf(5), corosync.conf(5), ccs(7), cman_tool(8) +cluster.conf(5), corosync.conf(5), cman_tool(8) diff --git a/cman/man/cman_tool.8 b/cman/man/cman_tool.8 index 6dd2c44..841586a 100644 --- a/cman/man/cman_tool.8 +++ b/cman/man/cman_tool.8 @@ -272,7 +272,7 @@ then copy that file to all nodes you want to join the cluster. .br .TP .I -C -Overrides the default configuration module. Usually cman uses ccsd to load its +Overrides the default configuration module. Usually cman uses xmlconfig (cluster.conf) to load its configuration. If you have your configuration database held elsewhere (eg LDAP) and have a configuration plugin for it, then you should specify the name of the module (see the documentation for the module for the name of it - it's not necessarily the @@ -282,7 +282,7 @@ It is possible to chain configuration modules by separating them with colons. So add two modules (eg) 'ldapconfig' and 'ldappreproc' to the chain start cman with -C ldapconfig:ldappreproc .br -The default value for this is 'ccsconfig'. Note that if the -X is on the command-line +The default value for this is 'xmlconfig'. Note that if the -X is on the command-line then -C will be ignored. .TP .I -A @@ -396,7 +396,7 @@ In this scenario we should kill the node node-02 and node-03. Of course, the 3 n This section details how the configuration systems work in cman. You might need to know this if you are using the -C option to cman_tool, or writing your own configuration subsystem. .br -By default cman uses two configuration plugins to corosync. The first, 'ccsconfig', reads the configuration information +By default cman uses two configuration plugins to corosync. The first, 'xmlconfig', reads the configuration information stored in cluster.conf and stores it in an internal database, in the same schema as it finds in cluster.conf. The second plugin, 'cmanpreconfig', takes the information in that the database, adds several cman defaults, determines the corosync node name and nodeID @@ -404,7 +404,7 @@ and formats the information in a similar manner to corosync.conf(5). Corosync th cmanpreconfig also reads several environment variables that might be set by cman_tool which can override information in the configuration. .br -In the absence of ccsconfig, ie when 'cman_tool join' is run with -X switch (this removes ccsconfig from the module list), +In the absence of xmlconfig, ie when 'cman_tool join' is run with -X switch (this removes xmlconfig from the module list), cmanpreconfig also generates several defaults so that the cluster can be got running without any configuration information - see above for the details. .br