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

5to6: attempt to resolve corosync rings

Browse Source 
and only fail if unable to

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

(backported from commit 669211d8bbb0857275669068fcbf62560782b888)

use local copy of resolve_hostname_like_corosync instead of
pve-cluster's.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2019-07-08 13:54:05 +02:00 committed by Thomas Lamprecht
parent e9ad9ab43f
commit b78378f3cc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/CLI/pve5to6.pm
View File

@ -434,8 +434,17 @@ sub check_cluster_corosync {
my $verify_ring_ip = sub { my $verify_ring_ip = sub {
my $key = shift; my $key = shift;
my $ring = $entry->{$key}; my $ring = $entry->{$key};
if (defined($ring) && !PVE::JSONSchema::pve_verify_ip($ring, 1)) { if (defined($ring)) {
log_fail("$key '$ring' of node '$cs_node' is not an IP address, consider replacing it with the currently resolved IP address."); 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.");
} else {
log_pass("$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!");
}
} }
}; };
$verify_ring_ip->('ring0_addr'); $verify_ring_ip->('ring0_addr');