Skip to content

Commit 2024f62

Browse files
committed
Revert "F #5917: Support for proxy in datastore drivers (#5977)"
This reverts commit 2e953be.
1 parent 2e953be commit 2024f62

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ share/esx-fw-vnc/*.rpm
7070
share/esx-fw-vnc/.vagrant*
7171

7272
*.vscode
73-
*.code-workspace
7473

7574
share/context/*
7675
!share/context/download_context.sh

src/market_mad/one_market.rb

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -317,13 +317,12 @@ def failure(asym, id, message)
317317
[ '--threads', '-t', GetoptLong::OPTIONAL_ARGUMENT ],
318318
[ '--market-types', '-m', GetoptLong::OPTIONAL_ARGUMENT ],
319319
[ '--timeout', '-w', GetoptLong::OPTIONAL_ARGUMENT ],
320-
[ '--proxy' '-p' , GetoptLong::OPTIONAL_ARGUMENT ]
320+
[ '--proxy' , GetoptLong::OPTIONAL_ARGUMENT ]
321321
)
322322

323323
mp_type = nil
324324
threads = 15
325325
timeout = nil
326-
proxy = nil
327326

328327
begin
329328
opts.each do |opt, arg|
@@ -334,18 +333,12 @@ def failure(asym, id, message)
334333
mp_type = arg.split(',').map {|a| a.strip }
335334
when '--timeout'
336335
timeout = arg.to_i
337-
when '--proxy'
338-
timeout = arg.to_i
339336
end
340337
end
341338
rescue Exception => e
342339
exit(-1)
343340
end
344341

345-
#Export proxy ip:port as env var for curl
346-
347-
ENV['http_proxy'] = File.read('/etc/one/oned.conf')[/(?<=--proxy\s)\S+/]
348-
349342
mp_driver = MarketPlaceDriver.new(mp_type,
350343
:concurrency => threads,
351344
:timeout => timeout)

0 commit comments

Comments
 (0)