[pve-devel] applied: [PATCH 0/7] Backport corosync related firewall changes to stable-5

Fabian Grünbichler f.gruenbichler at proxmox.com
Wed Aug 7 10:59:59 CEST 2019


applied series with a slight rewording/condensing of commit message #1, 
and a follow-up for patch #1/pve-cluster:

diff --git a/data/PVE/Corosync.pm b/data/PVE/Corosync.pm
index 6a27ab0..8b5c91e 100644
--- a/data/PVE/Corosync.pm
+++ b/data/PVE/Corosync.pm
@@ -296,7 +296,8 @@ sub resolve_hostname_like_corosync {
     my ($hostname, $corosync_conf) = @_;
 
     my $corosync_strategy = $corosync_conf->{main}->{totem}->{ip_version};
-    $corosync_strategy = lc ($corosync_strategy // "any");
+    # Corosync 2.x default
+    $corosync_strategy = lc ($corosync_strategy // "ipv4");
 
     my $match_ip_and_version = sub {
 	my ($addr) = @_;

and s/link/ring in the localnet output from patch#7

On July 22, 2019 3:21 pm, Stefan Reiter wrote:
> This includes the "followup series" (info printing on localnet call, fix of
> defindness checks on standalone nodes).
> 
> Modifications for backport:
>  - Use totem transport defaults from 2.x (i.e. multicast is default)
>  - Hostname resolving behaviour adapted to corosync 2.x
>  - Include --source filter for multicast packets
>    (this one could probably be added to stable as well, I'll look into it)
> 
> 
> cluster: Stefan Reiter (1):
>   Add functions to resolve hostnames and iterate corosync nodes
> 
>  data/PVE/Corosync.pm | 91 ++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 91 insertions(+)
> 
> firewall: Fabian Grünbichler (1):
>   corosync: refactor if conditions
> 
> firewall: Stefan Reiter (5):
>   Create corosync firewall rules independently of localnet
>   Update and add tests for corosync firewall changes
>   Only enable multicast rules when needed
>   Check if corosync.conf exists before calling parser
>   Display corosync rule info on localnet call
> 
>  src/PVE/Firewall.pm             | 79 ++++++++++++++++++++++++++-------
>  src/PVE/Service/pve_firewall.pm | 23 ++++++++++
>  test/corosync.conf              | 52 ++++++++++++++++++++++
>  test/fwtester.pl                | 11 ++++-
>  test/test-default-rules1/tests  |  4 ++
>  5 files changed, 151 insertions(+), 18 deletions(-)
>  create mode 100644 test/corosync.conf
> 
> -- 
> 2.20.1
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 



More information about the pve-devel mailing list