From: Alexandre Derumier <aderumier@odiso.com>
Date: Thu, 4 Jan 2024 16:11:35 +0000 (+0100)
Subject: sdn: prefer proxy from datacenter.cfg for api calls
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6e96fd3314b6d355b6f9df4712b721e08b0ccd11;p=mirror%2Fpve-network.git

sdn: prefer proxy from datacenter.cfg for api calls

We only setup proxies from the environment previously, but also check
the one configured in the cluster-wide datacenter.cfg and prefer that
over anything else.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---

diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
index 29213c6..c7dccfa 100644
--- a/src/PVE/Network/SDN.pm
+++ b/src/PVE/Network/SDN.pm
@@ -264,10 +264,9 @@ sub api_request {
     my $req = HTTP::Request->new($method,$url, $headers, $encoded_data);
 
     my $ua = LWP::UserAgent->new(protocols_allowed => ['http', 'https'], timeout => 30);
-    my $proxy = undef;
-
-    if ($proxy) {
-        $ua->proxy(['http', 'https'], $proxy);
+    my $datacenter_cfg = PVE::Cluster::cfs_read_file('datacenter.cfg');
+    if (my $proxy = $datacenter_cfg->{http_proxy}) {
+	$ua->proxy(['http', 'https'], $proxy);
     } else {
 	$ua->env_proxy;
     }