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 29213c6eb359502c865a9d383ca5756785858e7b..c7dccfa89fcf438ca52c04eeae1d1b2a67684e3a 100644 (file)
--- 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;
     }