Blame SOURCES/change-cman-to-rhel6-in-messages.patch

1f8f5b
From dbaa5bf9ed8cfa68b67afda4718c1cfc5ab847b6 Mon Sep 17 00:00:00 2001
129887
From: Ivan Devat <idevat@redhat.com>
129887
Date: Mon, 23 May 2016 17:00:13 +0200
1f8f5b
Subject: [PATCH 4/6] change cman to rhel6 in messages
129887
129887
---
129887
 pcs/cli/common/console_report.py |  8 ++++----
129887
 pcs/cluster.py                   |  6 +++---
129887
 pcs/config.py                    |  2 +-
129887
 pcs/pcs.8                        | 12 ++++++------
129887
 pcs/quorum.py                    |  2 +-
129887
 pcs/test/test_cluster.py         | 26 +++++++++++++-------------
129887
 pcs/usage.py                     | 20 ++++++++++----------
129887
 pcsd/views/_dialogs.erb          |  2 +-
129887
 pcsd/views/manage.erb            | 16 ++++++++--------
129887
 pcsd/views/nodes.erb             |  2 +-
129887
 10 files changed, 48 insertions(+), 48 deletions(-)
129887
129887
diff --git a/pcs/cli/common/console_report.py b/pcs/cli/common/console_report.py
1f8f5b
index b5885b6b..9108257e 100644
129887
--- a/pcs/cli/common/console_report.py
129887
+++ b/pcs/cli/common/console_report.py
129887
@@ -718,7 +718,7 @@ CODE_TO_MESSAGE_BUILDER_MAP = {
129887
     ,
129887
 
129887
     codes.CMAN_UNSUPPORTED_COMMAND:
129887
-        "This command is not supported on CMAN clusters"
129887
+        "This command is not supported on RHEL 6 clusters"
129887
     ,
129887
 
129887
     codes.ID_ALREADY_EXISTS: lambda info:
1f8f5b
@@ -986,7 +986,7 @@ CODE_TO_MESSAGE_BUILDER_MAP = {
129887
     ,
129887
 
129887
     codes.IGNORED_CMAN_UNSUPPORTED_OPTION: lambda info:
129887
-        "{option_name} ignored as it is not supported on CMAN clusters"
129887
+        "{option_name} ignored as it is not supported on RHEL 6 clusters"
129887
         .format(**info)
129887
     ,
129887
 
1f8f5b
@@ -995,12 +995,12 @@ CODE_TO_MESSAGE_BUILDER_MAP = {
129887
     ,
129887
 
129887
     codes.CMAN_UDPU_RESTART_REQUIRED: (
129887
-        "Using udpu transport on a CMAN cluster,"
129887
+        "Using udpu transport on a RHEL 6 cluster,"
129887
         " cluster restart is required after node add or remove"
129887
     ),
129887
 
129887
     codes.CMAN_BROADCAST_ALL_RINGS: (
129887
-        "Enabling broadcast for all rings as CMAN does not support"
129887
+        "Enabling broadcast for all rings as RHEL 6 does not support"
129887
         " broadcast in only one ring"
129887
     ),
129887
 
129887
diff --git a/pcs/cluster.py b/pcs/cluster.py
1f8f5b
index a32fdc7e..e8fa0ce4 100644
129887
--- a/pcs/cluster.py
129887
+++ b/pcs/cluster.py
1f8f5b
@@ -2125,7 +2125,7 @@ def node_add(lib_env, node0, node1, modifiers):
129887
     else:
129887
         utils.err("Unable to update any nodes")
129887
     if utils.is_cman_with_udpu_transport():
129887
-        print("Warning: Using udpu transport on a CMAN cluster, "
129887
+        print("Warning: Using udpu transport on a RHEL 6 cluster, "
129887
             + "cluster restart is required to apply node addition")
129887
     if wait:
129887
         print()
1f8f5b
@@ -2201,7 +2201,7 @@ def node_remove(lib_env, node0, modifiers):
129887
     output, retval = utils.reloadCorosync()
129887
     output, retval = utils.run(["crm_node", "--force", "-R", node0])
129887
     if utils.is_cman_with_udpu_transport():
129887
-        print("Warning: Using udpu transport on a CMAN cluster, "
129887
+        print("Warning: Using udpu transport on a RHEL 6 cluster, "
129887
             + "cluster restart is required to apply node removal")
129887
 
129887
 def cluster_localnode(argv):
1f8f5b
@@ -2369,7 +2369,7 @@ def cluster_uidgid(argv, silent_list = False):
129887
 
129887
 def cluster_get_corosync_conf(argv):
129887
     if utils.is_rhel6():
129887
-        utils.err("corosync.conf is not supported on CMAN clusters")
129887
+        utils.err("corosync.conf is not supported on RHEL 6 clusters")
129887
 
129887
     if len(argv) > 1:
129887
         usage.cluster()
129887
diff --git a/pcs/config.py b/pcs/config.py
129887
index 6c0f8194..f2cdbaa3 100644
129887
--- a/pcs/config.py
129887
+++ b/pcs/config.py
129887
@@ -741,7 +741,7 @@ def config_checkpoint_restore(argv):
129887
 
129887
 def config_import_cman(argv):
129887
     if no_clufter:
129887
-        utils.err("Unable to perform a CMAN cluster conversion due to missing python-clufter package")
129887
+        utils.err("Unable to perform a RHEL 6 cluster conversion due to missing python-clufter package")
129887
     # prepare convertor options
129887
     cluster_conf = settings.cluster_conf_file
129887
     dry_run_output = None
129887
diff --git a/pcs/pcs.8 b/pcs/pcs.8
1f8f5b
index 80b80ef7..82d2570e 100644
129887
--- a/pcs/pcs.8
129887
+++ b/pcs/pcs.8
1f8f5b
@@ -249,13 +249,13 @@ auth [<node>[:<port>]] [...] [\fB\-u\fR <username>] [\fB\-p\fR <password>] [\fB\
129887
 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.
129887
 .TP
129887
 setup [\fB\-\-start\fR [\fB\-\-wait\fR[=<n>]]] [\fB\-\-local\fR] [\fB\-\-enable\fR] \fB\-\-name\fR <cluster name> <node1[,node1\-altaddr]> [<node2[,node2\-altaddr]>] [...] [\fB\-\-transport\fR udpu|udp] [\fB\-\-rrpmode\fR active|passive] [\fB\-\-addr0\fR <addr/net> [[[\fB\-\-mcast0\fR <address>] [\fB\-\-mcastport0\fR <port>] [\fB\-\-ttl0\fR <ttl>]] | [\fB\-\-broadcast0\fR]] [\fB\-\-addr1\fR <addr/net> [[[\fB\-\-mcast1\fR <address>] [\fB\-\-mcastport1\fR <port>] [\fB\-\-ttl1\fR <ttl>]] | [\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=<time in ms>]] [\fB\-\-ipv6\fR] [\fB\-\-token\fR <timeout>] [\fB\-\-token_coefficient\fR <timeout>] [\fB\-\-join\fR <timeout>] [\fB\-\-consensus\fR <timeout>] [\fB\-\-netmtu\fR <size>] [\fB\-\-miss_count_const\fR <count>] [\fB\-\-fail_recv_const\fR <failures>] [\fB\-\-encryption\fR 0|1]
129887
-Configure corosync and sync configuration out to listed nodes. \fB\-\-local\fR will only perform changes on the local node, \fB\-\-start\fR will also start the cluster on the specified nodes, \fB\-\-wait\fR will wait up to 'n' seconds for the nodes to start, \fB\-\-enable\fR will enable corosync and pacemaker on node startup, \fB\-\-transport\fR allows specification of corosync transport (default: udpu; udp for CMAN clusters), \fB\-\-rrpmode\fR allows you to set the RRP mode of the system. Currently only 'passive' is supported or tested (using 'active' is not recommended). The \fB\-\-wait_for_all\fR, \fB\-\-auto_tie_breaker\fR, \fB\-\-last_man_standing\fR, \fB\-\-last_man_standing_window\fR options are all documented in corosync's votequorum(5) man page. These options are not supported on CMAN clusters.
129887
+Configure corosync and sync configuration out to listed nodes. \fB\-\-local\fR will only perform changes on the local node, \fB\-\-start\fR will also start the cluster on the specified nodes, \fB\-\-wait\fR will wait up to 'n' seconds for the nodes to start, \fB\-\-enable\fR will enable corosync and pacemaker on node startup, \fB\-\-transport\fR allows specification of corosync transport (default: udpu; udp for RHEL 6 clusters), \fB\-\-rrpmode\fR allows you to set the RRP mode of the system. Currently only 'passive' is supported or tested (using 'active' is not recommended). The \fB\-\-wait_for_all\fR, \fB\-\-auto_tie_breaker\fR, \fB\-\-last_man_standing\fR, \fB\-\-last_man_standing_window\fR options are all documented in corosync's votequorum(5) man page. These options are not supported on RHEL 6 clusters.
129887
 
129887
-\fB\-\-ipv6\fR will configure corosync to use ipv6 (instead of ipv4).  This option is not supported on CMAN clusters.
129887
+\fB\-\-ipv6\fR will configure corosync to use ipv6 (instead of ipv4).  This option is not supported on RHEL 6 clusters.
129887
 
129887
-\fB\-\-token\fR <timeout> sets time in milliseconds until a token loss is declared after not receiving a token (default 1000 ms; 10000 ms for CMAN clusters)
129887
+\fB\-\-token\fR <timeout> sets time in milliseconds until a token loss is declared after not receiving a token (default 1000 ms; 10000 ms for RHEL 6 clusters)
129887
 
129887
-\fB\-\-token_coefficient\fR <timeout> sets time in milliseconds used for clusters with at least 3 nodes as a coefficient for real token timeout calculation (token + (number_of_nodes - 2) * token_coefficient) (default 650 ms)  This option is not supported on CMAN clusters.
129887
+\fB\-\-token_coefficient\fR <timeout> sets time in milliseconds used for clusters with at least 3 nodes as a coefficient for real token timeout calculation (token + (number_of_nodes - 2) * token_coefficient) (default 650 ms)  This option is not supported on RHEL 6 clusters.
129887
 
129887
 \fB\-\-join\fR <timeout> sets time in milliseconds to wait for join messages (default 50 ms)
129887
 
1f8f5b
@@ -833,10 +833,10 @@ checkpoint restore <checkpoint_number>
129887
 Restore cluster configuration to specified checkpoint.
129887
 .TP
129887
 import\-cman output=<filename> [input=<filename>] [\fB\-\-interactive\fR] [output\-format=corosync.conf|cluster.conf] [dist=<dist>]
129887
-Converts CMAN cluster configuration to Pacemaker cluster configuration.  Converted configuration will be saved to 'output' file.  To send the configuration to the cluster nodes the 'pcs config restore' command can be used.  If \fB\-\-interactive\fR is specified you will be prompted to solve incompatibilities manually.  If no input is specified /etc/cluster/cluster.conf will be used.  You can force to create output containing either cluster.conf or corosync.conf using the output\-format option.  Optionally you can specify output version by setting 'dist' option e. g. rhel,6.8 or redhat,7.3 or debian,7 or ubuntu,trusty.  You can get the list of supported dist values by running the "clufter \fB\-\-list\-dists\fR" command.  If 'dist' is not specified, it defaults to this node's version if that matches output\-format, otherwise redhat,6.7 is used for cluster.conf and redhat,7.1 is used for corosync.conf.
129887
+Converts RHEL 6 (CMAN) cluster configuration to Pacemaker cluster configuration.  Converted configuration will be saved to 'output' file.  To send the configuration to the cluster nodes the 'pcs config restore' command can be used.  If \fB\-\-interactive\fR is specified you will be prompted to solve incompatibilities manually.  If no input is specified /etc/cluster/cluster.conf will be used.  You can force to create output containing either cluster.conf or corosync.conf using the output\-format option.  Optionally you can specify output version by setting 'dist' option e. g. rhel,6.8 or redhat,7.3 or debian,7 or ubuntu,trusty.  You can get the list of supported dist values by running the "clufter \fB\-\-list\-dists\fR" command.  If 'dist' is not specified, it defaults to this node's version if that matches output\-format, otherwise redhat,6.7 is used for cluster.conf and redhat,7.1 is used for corosync.conf.
129887
 .TP
129887
 import\-cman output=<filename> [input=<filename>] [\fB\-\-interactive\fR] output\-format=pcs\-commands|pcs\-commands\-verbose [dist=<dist>]
129887
-Converts CMAN cluster configuration to a list of pcs commands which recreates the same cluster as Pacemaker cluster when executed.  Commands will be saved to 'output' file.  For other options see above.
129887
+Converts RHEL 6 (CMAN) cluster configuration to a list of pcs commands which recreates the same cluster as Pacemaker cluster when executed.  Commands will be saved to 'output' file.  For other options see above.
129887
 .TP
129887
 export pcs\-commands|pcs\-commands\-verbose [output=<filename>] [dist=<dist>]
129887
 Creates a list of pcs commands which upon execution recreates the current cluster running on this node.  Commands will be saved to 'output' file or written to stdout if 'output' is not specified.  Use pcs\-commands to get a simple list of commands, whereas pcs\-commands\-verbose creates a list including comments and debug messages.  Optionally specify output version by setting 'dist' option e. g. rhel,6.8 or redhat,7.3 or debian,7 or ubuntu,trusty.  You can get the list of supported dist values by running the "clufter \fB\-\-list\-dists\fR" command.  If 'dist' is not specified, it defaults to this node's version.
129887
diff --git a/pcs/quorum.py b/pcs/quorum.py
129887
index 51f1b545..d384e9de 100644
129887
--- a/pcs/quorum.py
129887
+++ b/pcs/quorum.py
129887
@@ -245,7 +245,7 @@ def quorum_unblock_cmd(argv):
129887
         sys.exit(1)
129887
 
129887
     if utils.is_rhel6():
129887
-        utils.err("operation is not supported on CMAN clusters")
129887
+        utils.err("operation is not supported on RHEL 6 clusters")
129887
 
129887
     output, retval = utils.run(
129887
         ["corosync-cmapctl", "-g", "runtime.votequorum.wait_for_all_status"]
129887
diff --git a/pcs/test/test_cluster.py b/pcs/test/test_cluster.py
129887
index a65da7f9..98476190 100644
129887
--- a/pcs/test/test_cluster.py
129887
+++ b/pcs/test/test_cluster.py
129887
@@ -1352,7 +1352,7 @@ logging {
129887
             .format(cluster_conf_tmp)
129887
         )
129887
         ac(output, """\
129887
-Warning: Using udpu transport on a CMAN cluster, cluster restart is required after node add or remove
129887
+Warning: Using udpu transport on a RHEL 6 cluster, cluster restart is required after node add or remove
129887
 """)
129887
         self.assertEqual(returnVal, 0)
129887
         with open(cluster_conf_tmp) as f:
129887
@@ -1444,7 +1444,7 @@ logging {
129887
             .format(cluster_conf_tmp)
129887
         )
129887
         ac(output, """\
129887
-Warning: --ipv6 ignored as it is not supported on CMAN clusters
129887
+Warning: --ipv6 ignored as it is not supported on RHEL 6 clusters
129887
 """)
129887
         self.assertEqual(returnVal, 0)
129887
         with open(cluster_conf_tmp) as f:
129887
@@ -2038,7 +2038,7 @@ logging {
129887
         )
129887
         ac(output, """\
129887
 Error: 'blah' is not a valid RRP mode value, use active, passive, use --force to override
129887
-Warning: Enabling broadcast for all rings as CMAN does not support broadcast in only one ring
129887
+Warning: Enabling broadcast for all rings as RHEL 6 does not support broadcast in only one ring
129887
 """)
129887
         self.assertEqual(returnVal, 1)
129887
 
129887
@@ -2317,7 +2317,7 @@ Warning: Enabling broadcast for all rings as CMAN does not support broadcast in
129887
         )
129887
         ac(output, """\
129887
 Error: using a RRP mode of 'active' is not supported or tested, use --force to override
129887
-Warning: Enabling broadcast for all rings as CMAN does not support broadcast in only one ring
129887
+Warning: Enabling broadcast for all rings as RHEL 6 does not support broadcast in only one ring
129887
 """)
129887
         self.assertEqual(returnVal, 1)
129887
 
129887
@@ -2327,7 +2327,7 @@ Warning: Enabling broadcast for all rings as CMAN does not support broadcast in
129887
             .format(cluster_conf_tmp)
129887
         )
129887
         ac(output, """\
129887
-Warning: Enabling broadcast for all rings as CMAN does not support broadcast in only one ring
129887
+Warning: Enabling broadcast for all rings as RHEL 6 does not support broadcast in only one ring
129887
 Warning: using a RRP mode of 'active' is not supported or tested
129887
 """)
129887
         self.assertEqual(returnVal, 0)
129887
@@ -2396,7 +2396,7 @@ Error: if one node is configured for RRP, all nodes must be configured for RRP
129887
         )
129887
         ac(output, """\
129887
 Error: --addr0 and --addr1 can only be used with --transport=udp
129887
-Warning: Using udpu transport on a CMAN cluster, cluster restart is required after node add or remove
129887
+Warning: Using udpu transport on a RHEL 6 cluster, cluster restart is required after node add or remove
129887
 """)
129887
         self.assertEqual(returnVal, 1)
129887
 
129887
@@ -2486,7 +2486,7 @@ Warning: Using udpu transport on a CMAN cluster, cluster restart is required aft
129887
             .format(cluster_conf_tmp)
129887
         )
129887
         ac(output, """\
129887
-Warning: Enabling broadcast for all rings as CMAN does not support broadcast in only one ring
129887
+Warning: Enabling broadcast for all rings as RHEL 6 does not support broadcast in only one ring
129887
 """)
129887
         self.assertEqual(returnVal, 0)
129887
         with open(cluster_conf_tmp) as f:
129887
@@ -2501,7 +2501,7 @@ Warning: Enabling broadcast for all rings as CMAN does not support broadcast in
129887
             .format(cluster_conf_tmp)
129887
         )
129887
         ac(output, """\
129887
-Warning: Enabling broadcast for all rings as CMAN does not support broadcast in only one ring
129887
+Warning: Enabling broadcast for all rings as RHEL 6 does not support broadcast in only one ring
129887
 """)
129887
         self.assertEqual(returnVal, 0)
129887
         with open(cluster_conf_tmp) as f:
129887
@@ -2519,10 +2519,10 @@ Warning: Enabling broadcast for all rings as CMAN does not support broadcast in
129887
             .format(cluster_conf_tmp)
129887
         )
129887
         ac(output, """\
129887
-Warning: --wait_for_all ignored as it is not supported on CMAN clusters
129887
-Warning: --auto_tie_breaker ignored as it is not supported on CMAN clusters
129887
-Warning: --last_man_standing ignored as it is not supported on CMAN clusters
129887
-Warning: --last_man_standing_window ignored as it is not supported on CMAN clusters
129887
+Warning: --wait_for_all ignored as it is not supported on RHEL 6 clusters
129887
+Warning: --auto_tie_breaker ignored as it is not supported on RHEL 6 clusters
129887
+Warning: --last_man_standing ignored as it is not supported on RHEL 6 clusters
129887
+Warning: --last_man_standing_window ignored as it is not supported on RHEL 6 clusters
129887
 """)
129887
         self.assertEqual(returnVal, 0)
129887
         with open(cluster_conf_tmp) as f:
129887
@@ -2619,7 +2619,7 @@ logging {
129887
             .format(cluster_conf_tmp)
129887
         )
129887
         ac(output, """\
129887
-Warning: --token_coefficient ignored as it is not supported on CMAN clusters
129887
+Warning: --token_coefficient ignored as it is not supported on RHEL 6 clusters
129887
 """)
129887
         self.assertEqual(returnVal, 0)
129887
         with open(cluster_conf_tmp) as f:
129887
diff --git a/pcs/usage.py b/pcs/usage.py
1f8f5b
index 61e6826e..2eaac50b 100644
129887
--- a/pcs/usage.py
129887
+++ b/pcs/usage.py
1f8f5b
@@ -665,16 +665,16 @@ Commands:
129887
         --wait will wait up to 'n' seconds for the nodes to start,
129887
         --enable will enable corosync and pacemaker on node startup,
129887
         --transport allows specification of corosync transport (default: udpu;
129887
-            udp for CMAN clusters),
129887
+            udp for RHEL 6 clusters),
129887
         --rrpmode allows you to set the RRP mode of the system. Currently only
129887
             'passive' is supported or tested (using 'active' is not
129887
             recommended).
129887
         The --wait_for_all, --auto_tie_breaker, --last_man_standing,
129887
             --last_man_standing_window options are all documented in corosync's
129887
-            votequorum(5) man page. These options are not supported on CMAN
129887
+            votequorum(5) man page. These options are not supported on RHEL 6
129887
             clusters.
129887
         --ipv6 will configure corosync to use ipv6 (instead of ipv4). This
129887
-            option is not supported on CMAN clusters.
129887
+            option is not supported on RHEL 6 clusters.
129887
         --token <timeout> sets time in milliseconds until a token loss is
129887
             declared after not receiving a token (default 1000 ms;
129887
             10000 ms for CMAN clusters)
1f8f5b
@@ -682,7 +682,7 @@ Commands:
129887
             clusters with at least 3 nodes as a coefficient for real token
129887
             timeout calculation
129887
             (token + (number_of_nodes - 2) * token_coefficient) (default 650 ms)
129887
-            This option is not supported on CMAN clusters.
129887
+            This option is not supported on RHEL 6 clusters.
129887
         --join <timeout> sets time in milliseconds to wait for join messages
129887
             (default 50 ms)
129887
         --consensus <timeout> sets time in milliseconds to wait for consensus
1f8f5b
@@ -1475,9 +1475,9 @@ Commands:
129887
 
129887
     import-cman output=<filename> [input=<filename>] [--interactive]
129887
             [output-format=corosync.conf|cluster.conf] [dist=<dist>]
129887
-        Converts CMAN cluster configuration to Pacemaker cluster configuration.
129887
-        Converted configuration will be saved to 'output' file.  To send
129887
-        the configuration to the cluster nodes the 'pcs config restore'
129887
+        Converts RHEL 6 (CMAN) cluster configuration to Pacemaker cluster
129887
+        configuration. Converted configuration will be saved to 'output' file.
129887
+        To send the configuration to the cluster nodes the 'pcs config restore'
129887
         command can be used.  If --interactive is specified you will be
129887
         prompted to solve incompatibilities manually.  If no input is specified
129887
         /etc/cluster/cluster.conf will be used.  You can force to create output
1f8f5b
@@ -1491,9 +1491,9 @@ Commands:
129887
 
129887
     import-cman output=<filename> [input=<filename>] [--interactive]
129887
             output-format=pcs-commands|pcs-commands-verbose [dist=<dist>]
129887
-        Converts CMAN cluster configuration to a list of pcs commands which
129887
-        recreates the same cluster as Pacemaker cluster when executed.  Commands
129887
-        will be saved to 'output' file.  For other options see above.
129887
+        Converts RHEL 6 (CMAN) cluster configuration to a list of pcs commands
129887
+        which recreates the same cluster as Pacemaker cluster when executed.
129887
+        Commands will be saved to 'output' file.  For other options see above.
129887
 
129887
     export pcs-commands|pcs-commands-verbose [output=<filename>] [dist=<dist>]
129887
         Creates a list of pcs commands which upon execution recreates
129887
diff --git a/pcsd/views/_dialogs.erb b/pcsd/views/_dialogs.erb
129887
index b2797c6a..bc33e95f 100644
129887
--- a/pcsd/views/_dialogs.erb
129887
+++ b/pcsd/views/_dialogs.erb
129887
@@ -40,7 +40,7 @@
129887
   

Are you sure you want to remove the following node(s)?

129887
   
129887
   {{#if Pcs.is_cman_with_udpu_transport}}
129887
-    

This is a CMAN cluster with UDPU transport, cluster restart is required to apply node removal.

129887
+    

This is a RHEL 6 cluster with UDPU transport, cluster restart is required to apply node removal.

129887
   {{/if}}
129887
 
129887
 
129887
diff --git a/pcsd/views/manage.erb b/pcsd/views/manage.erb
129887
index 0f87263e..b4e79225 100644
129887
--- a/pcsd/views/manage.erb
129887
+++ b/pcsd/views/manage.erb
129887
@@ -214,9 +214,9 @@
129887
       At least one valid node must be entered.
129887
       You may not leave the cluster name field blank
129887
       Ring 1 addresses do not match to Ring 0 addresses
129887
-      Cannot use UDPU transport on CMAN cluster. Please select UDP transport in Advanced options.
129887
+      Cannot use UDPU transport on RHEL 6 cluster. Please select UDP transport in Advanced options.
129887
       Cannot create a cluster using nodes running different versions of RHEL.
129887
-      Cannot mix nodes running CMAN and nodes without CMAN in one cluster.
129887
+      Cannot mix nodes running RHEL 6 and nodes running RHEL 6 in one cluster.
129887
     
129887
     Advanced Options:
129887
     
129887
@@ -249,7 +249,7 @@ remaining 3 nodes will be fenced.
129887
 
129887
 It is very useful when combined with Last Man Standing.
129887
 
129887
-This option has no effect on CMAN cluster." %>
129887
+This option has no effect on RHEL 6 cluster." %>
129887
 	<% auto_tie_desc = "\
129887
 Enables Auto Tie Breaker (ATB) feature (default: off).
129887
 
129887
@@ -262,7 +262,7 @@ partition, or the set of nodes that are still in contact with the \
129887
 node that has the lowest nodeid will remain quorate. The other nodes \
129887
 will be inquorate.
129887
 
129887
-This option has no effect on CMAN cluster." %>
129887
+This option has no effect on RHEL 6 cluster." %>
129887
 	<% last_man_desc = "\
129887
 Enables Last Man Standing (LMS) feature (default: off).
129887
 
129887
@@ -283,18 +283,18 @@ Using the above 8 node cluster example, with LMS enabled the cluster \
129887
 can retain quorum and continue operating by losing, in a cascade \
129887
 fashion, up to 6 nodes with only 2 remaining active.
129887
 
129887
-This option has no effect on CMAN cluster." %>
129887
+This option has no effect on RHEL 6 cluster." %>
129887
 	<% last_man_window_desc = "\
129887
 Tunes Last Man Standing Window (default: 10000 ms)
129887
 
129887
 The window of time between when a node (or group of nodes die) and quorum \
129887
 is recalculated if the 'Last Man Standing' option is enabled.
129887
 
129887
-This option has no effect on CMAN cluster." %>
129887
+This option has no effect on RHEL 6 cluster." %>
129887
 	<% use_ipv6_desc = "\
129887
 Enables IPv6 for cluster communication (default: off)
129887
 
129887
-This option has no effect on CMAN cluster." %>
129887
+This option has no effect on RHEL 6 cluster." %>
129887
         <% token_timeout = "\
129887
 Sets time in milliseconds until a token loss is declared after not receiving \
129887
 a token (default: 1000 ms)" %>
129887
@@ -303,7 +303,7 @@ Sets time in milliseconds used for clusters with at least 3 nodes \
129887
 as a coefficient for real token timeout calculation \
129887
 (token + (number_of_nodes - 2) * token_coefficient) (default: 650 ms)
129887
 
129887
-This option has no effect on CMAN cluster." %>
129887
+This option has no effect on RHEL 6 cluster." %>
129887
         <% join_timeout = "\
129887
 Sets time in milliseconds to wait for join messages (default: 50 ms)" %>
129887
         <% consensus_timeout = "\
129887
diff --git a/pcsd/views/nodes.erb b/pcsd/views/nodes.erb
129887
index caf58842..0476d9c5 100644
129887
--- a/pcsd/views/nodes.erb
129887
+++ b/pcsd/views/nodes.erb
129887
@@ -382,7 +382,7 @@
129887
       {{/if}}
129887
       {{#if Pcs.is_cman_with_udpu_transport}}
129887
       
129887
-        This is a CMAN cluster with UDPU transport,
cluster restart is required to apply node addition.
129887
+        This is a RHEL 6 cluster with UDPU transport,
cluster restart is required to apply node addition.
129887
       
129887
       {{/if}}
129887
     
129887
-- 
129887
2.21.0
129887