This is the mail archive of the cluster-cvs@sourceware.org mailing list for the cluster.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

cluster: STABLE3 - cman: Change some more ais references to Corosync


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d2bb3a8ebb7b82bbede868ed970d3548aca21042
Commit:        d2bb3a8ebb7b82bbede868ed970d3548aca21042
Parent:        7aa9857d9a73d388bda41e28fc811ec4a56bdc00
Author:        Christine Caulfield <ccaulfie@redhat.com>
AuthorDate:    Thu Jun 4 14:32:39 2009 +0100
Committer:     Christine Caulfield <ccaulfie@redhat.com>
CommitterDate: Thu Jun 4 14:32:39 2009 +0100

cman: Change some more ais references to Corosync

Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
---
 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 <file>        Private key file for AIS communications\n");
-		printf("  -P               Don't set aisexec to realtime priority\n");
+		printf("  -k <file>        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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]