From 44f4f498e323a54fc83068975eaec19667801ee8 Mon Sep 17 00:00:00 2001 From: Ivan Devat Date: Mon, 23 May 2016 17:00:13 +0200 Subject: [PATCH 4/6] change cman to rhel6 in messages --- pcs/cli/common/console_report.py | 8 ++++---- pcs/cluster.py | 6 +++--- pcs/config.py | 2 +- pcs/pcs.8 | 12 ++++++------ pcs/quorum.py | 2 +- pcs/test/test_cluster.py | 26 +++++++++++++------------- pcs/usage.py | 20 ++++++++++---------- pcsd/views/_dialogs.erb | 2 +- pcsd/views/manage.erb | 16 ++++++++-------- pcsd/views/nodes.erb | 2 +- 10 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pcs/cli/common/console_report.py b/pcs/cli/common/console_report.py index b5885b6b..9108257e 100644 --- a/pcs/cli/common/console_report.py +++ b/pcs/cli/common/console_report.py @@ -718,7 +718,7 @@ CODE_TO_MESSAGE_BUILDER_MAP = { , codes.CMAN_UNSUPPORTED_COMMAND: - "This command is not supported on CMAN clusters" + "This command is not supported on RHEL 6 clusters" , codes.ID_ALREADY_EXISTS: lambda info: @@ -986,7 +986,7 @@ CODE_TO_MESSAGE_BUILDER_MAP = { , codes.IGNORED_CMAN_UNSUPPORTED_OPTION: lambda info: - "{option_name} ignored as it is not supported on CMAN clusters" + "{option_name} ignored as it is not supported on RHEL 6 clusters" .format(**info) , @@ -995,12 +995,12 @@ CODE_TO_MESSAGE_BUILDER_MAP = { , codes.CMAN_UDPU_RESTART_REQUIRED: ( - "Using udpu transport on a CMAN cluster," + "Using udpu transport on a RHEL 6 cluster," " cluster restart is required after node add or remove" ), codes.CMAN_BROADCAST_ALL_RINGS: ( - "Enabling broadcast for all rings as CMAN does not support" + "Enabling broadcast for all rings as RHEL 6 does not support" " broadcast in only one ring" ), diff --git a/pcs/cluster.py b/pcs/cluster.py index a32fdc7e..e8fa0ce4 100644 --- a/pcs/cluster.py +++ b/pcs/cluster.py @@ -2125,7 +2125,7 @@ def node_add(lib_env, node0, node1, modifiers): else: utils.err("Unable to update any nodes") if utils.is_cman_with_udpu_transport(): - print("Warning: Using udpu transport on a CMAN cluster, " + print("Warning: Using udpu transport on a RHEL 6 cluster, " + "cluster restart is required to apply node addition") if wait: print() @@ -2201,7 +2201,7 @@ def node_remove(lib_env, node0, modifiers): output, retval = utils.reloadCorosync() output, retval = utils.run(["crm_node", "--force", "-R", node0]) if utils.is_cman_with_udpu_transport(): - print("Warning: Using udpu transport on a CMAN cluster, " + print("Warning: Using udpu transport on a RHEL 6 cluster, " + "cluster restart is required to apply node removal") def cluster_localnode(argv): @@ -2369,7 +2369,7 @@ def cluster_uidgid(argv, silent_list = False): def cluster_get_corosync_conf(argv): if utils.is_rhel6(): - utils.err("corosync.conf is not supported on CMAN clusters") + utils.err("corosync.conf is not supported on RHEL 6 clusters") if len(argv) > 1: usage.cluster() diff --git a/pcs/config.py b/pcs/config.py index 6c0f8194..f2cdbaa3 100644 --- a/pcs/config.py +++ b/pcs/config.py @@ -741,7 +741,7 @@ def config_checkpoint_restore(argv): def config_import_cman(argv): if no_clufter: - utils.err("Unable to perform a CMAN cluster conversion due to missing python-clufter package") + utils.err("Unable to perform a RHEL 6 cluster conversion due to missing python-clufter package") # prepare convertor options cluster_conf = settings.cluster_conf_file dry_run_output = None diff --git a/pcs/pcs.8 b/pcs/pcs.8 index 3367f979..bb085339 100644 --- a/pcs/pcs.8 +++ b/pcs/pcs.8 @@ -249,13 +249,13 @@ auth [[:]] [...] [\fB\-u\fR ] [\fB\-p\fR ] [\fB\ Authenticate pcs to pcsd on nodes specified, or on all nodes configured in the local cluster if no nodes are specified (authorization tokens are stored in ~/.pcs/tokens or /var/lib/pcsd/tokens for root). By default all nodes are also authenticated to each other, using \fB\-\-local\fR only authenticates the local node (and does not authenticate the remote nodes with each other). Using \fB\-\-force\fR forces re\-authentication to occur. .TP setup [\fB\-\-start\fR [\fB\-\-wait\fR[=]]] [\fB\-\-local\fR] [\fB\-\-enable\fR] \fB\-\-name\fR [] [...] [\fB\-\-transport\fR udpu|udp] [\fB\-\-rrpmode\fR active|passive] [\fB\-\-addr0\fR [[[\fB\-\-mcast0\fR
] [\fB\-\-mcastport0\fR ] [\fB\-\-ttl0\fR ]] | [\fB\-\-broadcast0\fR]] [\fB\-\-addr1\fR [[[\fB\-\-mcast1\fR
] [\fB\-\-mcastport1\fR ] [\fB\-\-ttl1\fR ]] | [\fB\-\-broadcast1\fR]]]] [\fB\-\-wait_for_all\fR=<0|1>] [\fB\-\-auto_tie_breaker\fR=<0|1>] [\fB\-\-last_man_standing\fR=<0|1> [\fB\-\-last_man_standing_window\fR=