[pve-devel] [PATCH stable5 manager 6/6] 5to6: make corosync totem checks more verbose

[Fabian Grünbichler]

to avoid just printing the subheader with no results

Signed-off-by: Fabian Grünbichler <f.gruenbich...@proxmox.com>
(cherry picked from commit c4bc94bb7b019e3c5a4518eda55883bb989146c5)
---
 PVE/CLI/pve5to6.pm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/PVE/CLI/pve5to6.pm b/PVE/CLI/pve5to6.pm
index 0c7efbb1..618f20aa 100644
--- a/PVE/CLI/pve5to6.pm
+++ b/PVE/CLI/pve5to6.pm
@@ -459,15 +459,23 @@ sub check_cluster_corosync {
     my $totem = $conf->{main}->{totem};
     my $transport = $totem->{transport};
     if (defined($transport)) {
-       log_fail("Corosync transport explicitly set to '$transport' instead of 
implicit default!");
+       if ($transport ne 'knet') {
+           log_fail("Corosync transport explicitly set to '$transport' instead 
of implicit default!");
+       } else {
+           log_pass("Corosync transport set to '$transport'.");
+       }
+    } else {
+       log_pass("Corosync transport set to implicit default.");
     }
 
     if ((!defined($totem->{secauth}) || $totem->{secauth} ne 'on') && 
(!defined($totem->{crypto_cipher}) || $totem->{crypto_cipher} eq 'none')) {
        log_fail("Corosync authentication/encryption is not explicitly enabled 
(secauth / crypto_cipher / crypto_hash)!");
-    }
-
-    if (defined($totem->{crypto_cipher}) && $totem->{crypto_cipher} eq '3des') 
{
-       log_fail("Corosync encryption cipher set to '3des', no longer supported 
in Corosync 3.x!");
+    } else {
+       if (defined($totem->{crypto_cipher}) && $totem->{crypto_cipher} eq 
'3des') {
+           log_fail("Corosync encryption cipher set to '3des', no longer 
supported in Corosync 3.x!");
+       } else {
+           log_pass("Corosync encryption and authentication enabled.");
+       }
     }
 
     print "\n";
-- 
2.20.1


_______________________________________________
pve-devel mailing list
pve-devel@pve.proxmox.com
https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel