From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2656 invoked by alias); 4 Jun 2009 13:33:39 -0000 Received: (qmail 2649 invoked by alias); 4 Jun 2009 13:33:38 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 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: Change some more ais references to Corosync 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: 7aa9857d9a73d388bda41e28fc811ec4a56bdc00 X-Git-Newrev: d2bb3a8ebb7b82bbede868ed970d3548aca21042 From: Christine Caulfield Message-Id: <20090604133312.86EF0120312@lists.fedorahosted.org> Date: Thu, 04 Jun 2009 13:33: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/msg00464.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d2bb3a8ebb7b82bbede868ed970d3548aca21042 Commit: d2bb3a8ebb7b82bbede868ed970d3548aca21042 Parent: 7aa9857d9a73d388bda41e28fc811ec4a56bdc00 Author: Christine Caulfield AuthorDate: Thu Jun 4 14:32:39 2009 +0100 Committer: Christine Caulfield CommitterDate: Thu Jun 4 14:32:39 2009 +0100 cman: Change some more ais references to Corosync Signed-off-by: Christine Caulfield --- cman/cman_tool/main.c | 4 ++-- cman/man/cman.5 | 2 +- cman/man/cman_tool.8 | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/cman/cman_tool/main.c b/cman/cman_tool/main.c index 08e1397..cbee41e 100644 --- a/cman/cman_tool/main.c +++ b/cman/cman_tool/main.c @@ -53,8 +53,8 @@ static void print_usage(int subcmd) printf(" -w Wait until node has joined a cluster\n"); printf(" -q Wait until the cluster is quorate\n"); printf(" -t Maximum time (in seconds) to wait\n"); - printf(" -k Private key file for AIS communications\n"); - printf(" -P Don't set aisexec to realtime priority\n"); + printf(" -k Private key file for Corosync communications\n"); + printf(" -P Don't set corosync to realtime priority\n"); printf(" -X Use internal cman defaults for configuration\n"); printf(" -A Don't load openais services\n"); printf("\n"); diff --git a/cman/man/cman.5 b/cman/man/cman.5 index 9077ceb..7fff53d 100644 --- a/cman/man/cman.5 +++ b/cman/man/cman.5 @@ -159,7 +159,7 @@ traffic. \fIOther corosync parameters\fR .in +7 -When corosync is started by cman (cman_tool runs aisexec), the corosync.conf +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 parameters from the following sections in cluster.conf and load diff --git a/cman/man/cman_tool.8 b/cman/man/cman_tool.8 index 39d5f5a..6dd2c44 100644 --- a/cman/man/cman_tool.8 +++ b/cman/man/cman_tool.8 @@ -264,9 +264,7 @@ failover cluster this might save you some effort. On each node using this configuration you will need to have the same authorization key installed. To create this key run .br -mkdir /etc/ais -.br -ais-keygen +corosync-keygen .br mv /etc/ais/authkey /etc/cluster/cman_authkey .br