F #5917: Support for proxy in datastore drivers (#5977)

OpenNebula · Sep 26, 2022 · 2e953be · 2e953be
1 parent 4ac2cd4
commit 2e953be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -70,6 +70,7 @@ share/esx-fw-vnc/*.rpm
 share/esx-fw-vnc/.vagrant*
 
 *.vscode
+*.code-workspace
 
 share/context/*
 !share/context/download_context.sh

diff --git a/src/market_mad/one_market.rb b/src/market_mad/one_market.rb
@@ -317,12 +317,13 @@ def failure(asym, id, message)
     [ '--threads',         '-t', GetoptLong::OPTIONAL_ARGUMENT ],
     [ '--market-types',    '-m', GetoptLong::OPTIONAL_ARGUMENT ],
     [ '--timeout',         '-w', GetoptLong::OPTIONAL_ARGUMENT ],
-    [ '--proxy'                , GetoptLong::OPTIONAL_ARGUMENT ]
+    [ '--proxy'            '-p'    , GetoptLong::OPTIONAL_ARGUMENT ]
 )
 
 mp_type = nil
 threads = 15
 timeout = nil
+proxy   = nil
 
 begin
     opts.each do |opt, arg|
@@ -333,12 +334,18 @@ def failure(asym, id, message)
                 mp_type = arg.split(',').map {|a| a.strip }
             when '--timeout'
                 timeout = arg.to_i
+            when '--proxy'
+                timeout = arg.to_i
         end
     end
 rescue Exception => e
     exit(-1)
 end
 
+#Export proxy ip:port as env var for curl
+
+ENV['http_proxy'] = File.read('/etc/one/oned.conf')[/(?<=--proxy\s)\S+/]
+
 mp_driver = MarketPlaceDriver.new(mp_type,
                                   :concurrency  => threads,
                                   :timeout      => timeout)