proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-16 14:49:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

5to6: reword/-structure corosync message

Browse Source 
and fix a typo as well

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2019-07-05 14:44:06 +02:00 committed by Thomas Lamprecht
parent 0e78b5157e
commit b481d354c8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/CLI/pve5to6.pm
View File

@ -362,9 +362,9 @@ sub check_cluster_corosync {
foreach my $cs_node (keys %$conf_nodelist) { foreach my $cs_node (keys %$conf_nodelist) {
my $entry = $conf_nodelist->{$cs_node}; 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}); 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}); if !defined($entry->{nodeid});
my $verify_ring_ip = sub { my $verify_ring_ip = sub {
@ -374,12 +374,12 @@ sub check_cluster_corosync {
my ($resolved_ip, undef) = PVE::Corosync::resolve_hostname_like_corosync($ring, $conf); my ($resolved_ip, undef) = PVE::Corosync::resolve_hostname_like_corosync($ring, $conf);
if (defined($resolved_ip)) { if (defined($resolved_ip)) {
if ($resolved_ip ne $ring) { 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 { } else {
log_pass("$key is configured to use IP address '$ring'"); log_pass("$cs_node: $key is configured to use IP address '$ring'");
} }
} else { } 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!");
} }
} }
}; };
@ -391,7 +391,7 @@ sub check_cluster_corosync {
my $transport = $totem->{transport}; my $transport = $totem->{transport};
if (defined($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')) { if ((!defined($totem->{secauth}) || $totem->{secauth} ne 'on') && (!defined($totem->{crypto_cipher}) || $totem->{crypto_cipher} eq 'none')) {