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

48ab60
From 2f1dd5e33e00cd36f47ca91ed21a3071f0ef0c6e Mon Sep 17 00:00:00 2001
15f218
From: Ivan Devat <idevat@redhat.com>
15f218
Date: Mon, 23 May 2016 17:00:13 +0200
48ab60
Subject: [PATCH] change cman to rhel6 in messages
15f218
15f218
---
f778fe
 pcs/cli/common/console_report.py |  8 ++++----
f778fe
 pcs/cluster.py                   |  6 +++---
f778fe
 pcs/config.py                    |  2 +-
be1b1f
 pcs/pcs.8                        | 12 ++++++------
f778fe
 pcs/quorum.py                    |  2 +-
f778fe
 pcs/test/test_cluster.py         | 26 +++++++++++++-------------
f778fe
 pcs/usage.py                     | 20 ++++++++++----------
f778fe
 pcsd/views/_dialogs.erb          |  2 +-
f778fe
 pcsd/views/manage.erb            | 16 ++++++++--------
f778fe
 pcsd/views/nodes.erb             |  2 +-
be1b1f
 10 files changed, 48 insertions(+), 48 deletions(-)
15f218
f778fe
diff --git a/pcs/cli/common/console_report.py b/pcs/cli/common/console_report.py
48ab60
index 4e0ae436..945b83f6 100644
f778fe
--- a/pcs/cli/common/console_report.py
f778fe
+++ b/pcs/cli/common/console_report.py
48ab60
@@ -698,7 +698,7 @@ CODE_TO_MESSAGE_BUILDER_MAP = {
f778fe
     ,
f778fe
 
f778fe
     codes.CMAN_UNSUPPORTED_COMMAND:
f778fe
-        "This command is not supported on CMAN clusters"
f778fe
+        "This command is not supported on RHEL 6 clusters"
f778fe
     ,
f778fe
 
f778fe
     codes.ID_ALREADY_EXISTS: lambda info:
48ab60
@@ -958,7 +958,7 @@ CODE_TO_MESSAGE_BUILDER_MAP = {
f778fe
     ,
f778fe
 
f778fe
     codes.IGNORED_CMAN_UNSUPPORTED_OPTION: lambda info:
f778fe
-        "{option_name} ignored as it is not supported on CMAN clusters"
f778fe
+        "{option_name} ignored as it is not supported on RHEL 6 clusters"
f778fe
         .format(**info)
f778fe
     ,
f778fe
 
48ab60
@@ -967,12 +967,12 @@ CODE_TO_MESSAGE_BUILDER_MAP = {
f778fe
     ,
f778fe
 
f778fe
     codes.CMAN_UDPU_RESTART_REQUIRED: (
f778fe
-        "Using udpu transport on a CMAN cluster,"
f778fe
+        "Using udpu transport on a RHEL 6 cluster,"
f778fe
         " cluster restart is required after node add or remove"
f778fe
     ),
f778fe
 
f778fe
     codes.CMAN_BROADCAST_ALL_RINGS: (
f778fe
-        "Enabling broadcast for all rings as CMAN does not support"
f778fe
+        "Enabling broadcast for all rings as RHEL 6 does not support"
f778fe
         " broadcast in only one ring"
f778fe
     ),
f778fe
 
15f218
diff --git a/pcs/cluster.py b/pcs/cluster.py
48ab60
index 42e94a94..d54d8fb9 100644
15f218
--- a/pcs/cluster.py
15f218
+++ b/pcs/cluster.py
48ab60
@@ -2111,7 +2111,7 @@ def node_add(lib_env, node0, node1, modifiers):
f778fe
     else:
f778fe
         utils.err("Unable to update any nodes")
f778fe
     if utils.is_cman_with_udpu_transport():
f778fe
-        print("Warning: Using udpu transport on a CMAN cluster, "
f778fe
+        print("Warning: Using udpu transport on a RHEL 6 cluster, "
f778fe
             + "cluster restart is required to apply node addition")
f778fe
     if wait:
f778fe
         print()
48ab60
@@ -2187,7 +2187,7 @@ def node_remove(lib_env, node0, modifiers):
f778fe
     output, retval = utils.reloadCorosync()
f778fe
     output, retval = utils.run(["crm_node", "--force", "-R", node0])
f778fe
     if utils.is_cman_with_udpu_transport():
f778fe
-        print("Warning: Using udpu transport on a CMAN cluster, "
f778fe
+        print("Warning: Using udpu transport on a RHEL 6 cluster, "
f778fe
             + "cluster restart is required to apply node removal")
15f218
 
15f218
 def cluster_localnode(argv):
48ab60
@@ -2355,7 +2355,7 @@ def cluster_uidgid(argv, silent_list = False):
15f218
 
15f218
 def cluster_get_corosync_conf(argv):
15f218
     if utils.is_rhel6():
15f218
-        utils.err("corosync.conf is not supported on CMAN clusters")
15f218
+        utils.err("corosync.conf is not supported on RHEL 6 clusters")
15f218
 
15f218
     if len(argv) > 1:
15f218
         usage.cluster()
f778fe
diff --git a/pcs/config.py b/pcs/config.py
48ab60
index 0afcd85d..8f31e79a 100644
f778fe
--- a/pcs/config.py
f778fe
+++ b/pcs/config.py
48ab60
@@ -740,7 +740,7 @@ def config_checkpoint_restore(argv):
15f218
 
f778fe
 def config_import_cman(argv):
f778fe
     if no_clufter:
f778fe
-        utils.err("Unable to perform a CMAN cluster conversion due to missing python-clufter package")
f778fe
+        utils.err("Unable to perform a RHEL 6 cluster conversion due to missing python-clufter package")
f778fe
     # prepare convertor options
f778fe
     cluster_conf = settings.cluster_conf_file
f778fe
     dry_run_output = None
15f218
diff --git a/pcs/pcs.8 b/pcs/pcs.8
48ab60
index 6440bb70..0ec4359a 100644
15f218
--- a/pcs/pcs.8
15f218
+++ b/pcs/pcs.8
48ab60
@@ -215,13 +215,13 @@ auth [<node>[:<port>]] [...] [\fB\-u\fR <username>] [\fB\-p\fR <password>] [\fB\
f778fe
 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.
15f218
 .TP
be1b1f
 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]
15f218
-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.
15f218
+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.
15f218
 
15f218
-\fB\-\-ipv6\fR will configure corosync to use ipv6 (instead of ipv4).  This option is not supported on CMAN clusters.
15f218
+\fB\-\-ipv6\fR will configure corosync to use ipv6 (instead of ipv4).  This option is not supported on RHEL 6 clusters.
15f218
 
be1b1f
-\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)
be1b1f
+\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)
15f218
 
15f218
-\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.
15f218
+\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.
15f218
 
15f218
 \fB\-\-join\fR <timeout> sets time in milliseconds to wait for join messages (default 50 ms)
15f218
 
48ab60
@@ -778,10 +778,10 @@ checkpoint restore <checkpoint_number>
15f218
 Restore cluster configuration to specified checkpoint.
15f218
 .TP
15f218
 import\-cman output=<filename> [input=<filename>] [\fB\-\-interactive\fR] [output\-format=corosync.conf|cluster.conf] [dist=<dist>]
f778fe
-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.
f778fe
+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.
15f218
 .TP
f778fe
 import\-cman output=<filename> [input=<filename>] [\fB\-\-interactive\fR] output\-format=pcs\-commands|pcs\-commands\-verbose [dist=<dist>]
15f218
-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.
15f218
+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.
15f218
 .TP
15f218
 export pcs\-commands|pcs\-commands\-verbose [output=<filename>] [dist=<dist>]
f778fe
 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.
f778fe
diff --git a/pcs/quorum.py b/pcs/quorum.py
be1b1f
index 51f1b545..d384e9de 100644
f778fe
--- a/pcs/quorum.py
f778fe
+++ b/pcs/quorum.py
a3a2ad
@@ -245,7 +245,7 @@ def quorum_unblock_cmd(argv):
f778fe
         sys.exit(1)
f778fe
 
f778fe
     if utils.is_rhel6():
f778fe
-        utils.err("operation is not supported on CMAN clusters")
f778fe
+        utils.err("operation is not supported on RHEL 6 clusters")
f778fe
 
f778fe
     output, retval = utils.run(
f778fe
         ["corosync-cmapctl", "-g", "runtime.votequorum.wait_for_all_status"]
f778fe
diff --git a/pcs/test/test_cluster.py b/pcs/test/test_cluster.py
48ab60
index a65da7f9..98476190 100644
f778fe
--- a/pcs/test/test_cluster.py
f778fe
+++ b/pcs/test/test_cluster.py
48ab60
@@ -1352,7 +1352,7 @@ logging {
f778fe
             .format(cluster_conf_tmp)
f778fe
         )
f778fe
         ac(output, """\
f778fe
-Warning: Using udpu transport on a CMAN cluster, cluster restart is required after node add or remove
f778fe
+Warning: Using udpu transport on a RHEL 6 cluster, cluster restart is required after node add or remove
f778fe
 """)
f778fe
         self.assertEqual(returnVal, 0)
f778fe
         with open(cluster_conf_tmp) as f:
48ab60
@@ -1444,7 +1444,7 @@ logging {
f778fe
             .format(cluster_conf_tmp)
f778fe
         )
f778fe
         ac(output, """\
f778fe
-Warning: --ipv6 ignored as it is not supported on CMAN clusters
f778fe
+Warning: --ipv6 ignored as it is not supported on RHEL 6 clusters
f778fe
 """)
f778fe
         self.assertEqual(returnVal, 0)
f778fe
         with open(cluster_conf_tmp) as f:
48ab60
@@ -2038,7 +2038,7 @@ logging {
f778fe
         )
f778fe
         ac(output, """\
f778fe
 Error: 'blah' is not a valid RRP mode value, use active, passive, use --force to override
f778fe
-Warning: Enabling broadcast for all rings as CMAN does not support broadcast in only one ring
f778fe
+Warning: Enabling broadcast for all rings as RHEL 6 does not support broadcast in only one ring
f778fe
 """)
f778fe
         self.assertEqual(returnVal, 1)
f778fe
 
48ab60
@@ -2317,7 +2317,7 @@ Warning: Enabling broadcast for all rings as CMAN does not support broadcast in
f778fe
         )
f778fe
         ac(output, """\
f778fe
 Error: using a RRP mode of 'active' is not supported or tested, use --force to override
f778fe
-Warning: Enabling broadcast for all rings as CMAN does not support broadcast in only one ring
f778fe
+Warning: Enabling broadcast for all rings as RHEL 6 does not support broadcast in only one ring
f778fe
 """)
f778fe
         self.assertEqual(returnVal, 1)
f778fe
 
48ab60
@@ -2327,7 +2327,7 @@ Warning: Enabling broadcast for all rings as CMAN does not support broadcast in
f778fe
             .format(cluster_conf_tmp)
f778fe
         )
f778fe
         ac(output, """\
f778fe
-Warning: Enabling broadcast for all rings as CMAN does not support broadcast in only one ring
f778fe
+Warning: Enabling broadcast for all rings as RHEL 6 does not support broadcast in only one ring
f778fe
 Warning: using a RRP mode of 'active' is not supported or tested
f778fe
 """)
f778fe
         self.assertEqual(returnVal, 0)
48ab60
@@ -2396,7 +2396,7 @@ Error: if one node is configured for RRP, all nodes must be configured for RRP
f778fe
         )
f778fe
         ac(output, """\
f778fe
 Error: --addr0 and --addr1 can only be used with --transport=udp
f778fe
-Warning: Using udpu transport on a CMAN cluster, cluster restart is required after node add or remove
f778fe
+Warning: Using udpu transport on a RHEL 6 cluster, cluster restart is required after node add or remove
f778fe
 """)
f778fe
         self.assertEqual(returnVal, 1)
f778fe
 
48ab60
@@ -2486,7 +2486,7 @@ Warning: Using udpu transport on a CMAN cluster, cluster restart is required aft
f778fe
             .format(cluster_conf_tmp)
f778fe
         )
f778fe
         ac(output, """\
f778fe
-Warning: Enabling broadcast for all rings as CMAN does not support broadcast in only one ring
f778fe
+Warning: Enabling broadcast for all rings as RHEL 6 does not support broadcast in only one ring
f778fe
 """)
f778fe
         self.assertEqual(returnVal, 0)
f778fe
         with open(cluster_conf_tmp) as f:
48ab60
@@ -2501,7 +2501,7 @@ Warning: Enabling broadcast for all rings as CMAN does not support broadcast in
f778fe
             .format(cluster_conf_tmp)
f778fe
         )
f778fe
         ac(output, """\
f778fe
-Warning: Enabling broadcast for all rings as CMAN does not support broadcast in only one ring
f778fe
+Warning: Enabling broadcast for all rings as RHEL 6 does not support broadcast in only one ring
f778fe
 """)
f778fe
         self.assertEqual(returnVal, 0)
f778fe
         with open(cluster_conf_tmp) as f:
48ab60
@@ -2519,10 +2519,10 @@ Warning: Enabling broadcast for all rings as CMAN does not support broadcast in
f778fe
             .format(cluster_conf_tmp)
f778fe
         )
f778fe
         ac(output, """\
f778fe
-Warning: --wait_for_all ignored as it is not supported on CMAN clusters
f778fe
-Warning: --auto_tie_breaker ignored as it is not supported on CMAN clusters
f778fe
-Warning: --last_man_standing ignored as it is not supported on CMAN clusters
f778fe
-Warning: --last_man_standing_window ignored as it is not supported on CMAN clusters
f778fe
+Warning: --wait_for_all ignored as it is not supported on RHEL 6 clusters
f778fe
+Warning: --auto_tie_breaker ignored as it is not supported on RHEL 6 clusters
f778fe
+Warning: --last_man_standing ignored as it is not supported on RHEL 6 clusters
f778fe
+Warning: --last_man_standing_window ignored as it is not supported on RHEL 6 clusters
f778fe
 """)
f778fe
         self.assertEqual(returnVal, 0)
f778fe
         with open(cluster_conf_tmp) as f:
48ab60
@@ -2619,7 +2619,7 @@ logging {
f778fe
             .format(cluster_conf_tmp)
f778fe
         )
f778fe
         ac(output, """\
f778fe
-Warning: --token_coefficient ignored as it is not supported on CMAN clusters
f778fe
+Warning: --token_coefficient ignored as it is not supported on RHEL 6 clusters
f778fe
 """)
f778fe
         self.assertEqual(returnVal, 0)
f778fe
         with open(cluster_conf_tmp) as f:
15f218
diff --git a/pcs/usage.py b/pcs/usage.py
48ab60
index 7614a85a..80ba9168 100644
15f218
--- a/pcs/usage.py
15f218
+++ b/pcs/usage.py
48ab60
@@ -623,16 +623,16 @@ Commands:
15f218
         --wait will wait up to 'n' seconds for the nodes to start,
15f218
         --enable will enable corosync and pacemaker on node startup,
15f218
         --transport allows specification of corosync transport (default: udpu;
15f218
-            udp for CMAN clusters),
15f218
+            udp for RHEL 6 clusters),
15f218
         --rrpmode allows you to set the RRP mode of the system. Currently only
15f218
             'passive' is supported or tested (using 'active' is not
15f218
             recommended).
15f218
         The --wait_for_all, --auto_tie_breaker, --last_man_standing,
15f218
             --last_man_standing_window options are all documented in corosync's
15f218
-            votequorum(5) man page. These options are not supported on CMAN
15f218
+            votequorum(5) man page. These options are not supported on RHEL 6
15f218
             clusters.
15f218
         --ipv6 will configure corosync to use ipv6 (instead of ipv4). This
15f218
-            option is not supported on CMAN clusters.
15f218
+            option is not supported on RHEL 6 clusters.
15f218
         --token <timeout> sets time in milliseconds until a token loss is
be1b1f
             declared after not receiving a token (default 1000 ms;
be1b1f
             10000 ms for CMAN clusters)
48ab60
@@ -640,7 +640,7 @@ Commands:
f778fe
             clusters with at least 3 nodes as a coefficient for real token
f778fe
             timeout calculation
15f218
             (token + (number_of_nodes - 2) * token_coefficient) (default 650 ms)
15f218
-            This option is not supported on CMAN clusters.
15f218
+            This option is not supported on RHEL 6 clusters.
15f218
         --join <timeout> sets time in milliseconds to wait for join messages
15f218
             (default 50 ms)
15f218
         --consensus <timeout> sets time in milliseconds to wait for consensus
48ab60
@@ -1416,9 +1416,9 @@ Commands:
15f218
 
15f218
     import-cman output=<filename> [input=<filename>] [--interactive]
15f218
             [output-format=corosync.conf|cluster.conf] [dist=<dist>]
15f218
-        Converts CMAN cluster configuration to Pacemaker cluster configuration.
15f218
-        Converted configuration will be saved to 'output' file.  To send
15f218
-        the configuration to the cluster nodes the 'pcs config restore'
15f218
+        Converts RHEL 6 (CMAN) cluster configuration to Pacemaker cluster
15f218
+        configuration. Converted configuration will be saved to 'output' file.
15f218
+        To send the configuration to the cluster nodes the 'pcs config restore'
15f218
         command can be used.  If --interactive is specified you will be
15f218
         prompted to solve incompatibilities manually.  If no input is specified
15f218
         /etc/cluster/cluster.conf will be used.  You can force to create output
48ab60
@@ -1432,9 +1432,9 @@ Commands:
15f218
 
15f218
     import-cman output=<filename> [input=<filename>] [--interactive]
15f218
             output-format=pcs-commands|pcs-commands-verbose [dist=<dist>]
15f218
-        Converts CMAN cluster configuration to a list of pcs commands which
15f218
-        recreates the same cluster as Pacemaker cluster when executed.  Commands
15f218
-        will be saved to 'output' file.  For other options see above.
15f218
+        Converts RHEL 6 (CMAN) cluster configuration to a list of pcs commands
15f218
+        which recreates the same cluster as Pacemaker cluster when executed.
15f218
+        Commands will be saved to 'output' file.  For other options see above.
15f218
 
15f218
     export pcs-commands|pcs-commands-verbose [output=<filename>] [dist=<dist>]
15f218
         Creates a list of pcs commands which upon execution recreates
15f218
diff --git a/pcsd/views/_dialogs.erb b/pcsd/views/_dialogs.erb
be1b1f
index b2797c6a..bc33e95f 100644
15f218
--- a/pcsd/views/_dialogs.erb
15f218
+++ b/pcsd/views/_dialogs.erb
15f218
@@ -40,7 +40,7 @@
15f218
   

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

15f218
   
15f218
   {{#if Pcs.is_cman_with_udpu_transport}}
15f218
-    

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

15f218
+    

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

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