From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 3A3141FF165 for ; Thu, 17 Jul 2025 17:27:46 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4715B3EBD4; Thu, 17 Jul 2025 17:28:47 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 17 Jul 2025 17:28:38 +0200 Message-Id: <20250717152841.397830-4-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250717152841.397830-1-s.hanreich@proxmox.com> References: <20250717152841.397830-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.210 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH pve-manager 1/4] pve-sdn-commit: fix reloading logic X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The API for generating the SDN configuration has been changed in the fabrics patch series ('387cc48'). Use the new API to commit the SDN configuration on boot, since otherwise the one-shot service fails to apply the SDN configuration on boot. The service was also missing an ifreload, since the ifupdown2 config gets regenerated by SDN and needs to be applied before generating the FRR configuration in order for the FRR config generation to work properly. Signed-off-by: Stefan Hanreich --- bin/pve-sdn-commit | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/bin/pve-sdn-commit b/bin/pve-sdn-commit index 2654e17ed..09e4387c5 100644 --- a/bin/pve-sdn-commit +++ b/bin/pve-sdn-commit @@ -4,11 +4,26 @@ use strict; use warnings; use PVE::Network::SDN; +use PVE::Tools; +my $previous_config_has_frr = PVE::Network::SDN::running_config_has_frr(); PVE::Network::SDN::commit_config(); -PVE::Network::SDN::generate_zone_config(); +my $new_config_has_frr = PVE::Network::SDN::running_config_has_frr(); +my $skip_frr = !($previous_config_has_frr || $new_config_has_frr); + +PVE::Network::SDN::generate_etc_network_config(); PVE::Network::SDN::generate_dhcp_config(); -PVE::Network::SDN::generate_controller_config(1); + +my $err = sub { + my $line = shift; + if ($line =~ /(warning|error): (\S+):/) { + print "$2 : $line \n"; + } +}; + +PVE::Tools::run_command(['ifreload', '-a'], errfunc => $err); + +PVE::Network::SDN::generate_frr_config(1) if !$skip_frr; exit 0; -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel