[pve-devel] [PATCH stable5 manager 3/6] 5to6: reword/-structure corosync message

[Fabian Grünbichler]

and fix a typo as well

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
(cherry picked from commit 388a505104eae0d8c6389b247aba7eca713b03ba)
---
 PVE/CLI/pve5to6.pm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/PVE/CLI/pve5to6.pm b/PVE/CLI/pve5to6.pm
index f84a8c1b..33079553 100644
--- a/PVE/CLI/pve5to6.pm
+++ b/PVE/CLI/pve5to6.pm
@@ -426,9 +426,9 @@ sub check_cluster_corosync {
 
     foreach my $cs_node (keys %$conf_nodelist) {
 	my $entry = $conf_nodelist->{$cs_node};
-	log_fail("No name entry for node '$cs_node' in corosync.conf.")
+	log_fail("$cs_node: no name entry in corosync.conf.")
 	    if !defined($entry->{name});
-	log_fail("No nodeid configured for node '$cs_node' in corosync.conf.")
+	log_fail("$cs_node: no nodeid configured in corosync.conf.")
 	    if !defined($entry->{nodeid});
 
 	my $verify_ring_ip = sub {
@@ -438,12 +438,12 @@ sub check_cluster_corosync {
 		my ($resolved_ip, undef) = $resolve_hostname_like_corosync->($ring, $conf);
 		if (defined($resolved_ip)) {
 		    if ($resolved_ip ne $ring) {
-			log_warn("$key '$ring' of node '$cs_node' resolves to '$resolved_ip'.\n Consider replacing it with the currently resolved IP address.");
+			log_warn("$cs_node: $key '$ring' resolves to '$resolved_ip'.\n Consider replacing it with the currently resolved IP address.");
 		    } else {
-			log_pass("$key is configured to use IP address '$ring'");
+			log_pass("$cs_node: $key is configured to use IP address '$ring'");
 		    }
 		} else {
-		    log_fail("unable to resolve $key '$ring' of node '$cs_node' to an IP address according to Corosync's resolve strategy - cluster will fail with Corosync 3.x/kronosnet!");
+		    log_fail("$cs_node: unable to resolve $key '$ring' to an IP address according to Corosync's resolve strategy - cluster will potentially fail with Corosync 3.x/kronosnet!");
 		}
 	    }
 	};
@@ -455,7 +455,7 @@ sub check_cluster_corosync {
 
     my $transport = $totem->{transport};
     if (defined($transport)) {
-	log_fail("Corosync transport expliclitly set to '$transport' instead of implicit default!");
+	log_fail("Corosync transport explicitly set to '$transport' instead of implicit default!");
     }
 
     if ((!defined($totem->{secauth}) || $totem->{secauth} ne 'on') && (!defined($totem->{crypto_cipher}) || $totem->{crypto_cipher} eq 'none')) {
-- 
2.20.1