clearlinux/cloud-native-setup
2
0
Fork 0
mirror of https://github.com/clearlinux/cloud-native-setup.git synced 2026-09-02 03:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes no_proxy issues with Vagrant file (#172)

Browse Source 
Vagrant file blows up if http_proxy is set but no_proxy is not set. This
was discovered during the testing of the initial patch which was to add
the default CIDR for Vagrant to the no_proxy settings.

Closes issue #136

Signed-off-by: craigsterrett <craig.sterrett@intel.com>
This commit is contained in:
CraigSterrett
2019-09-04 11:44:34 -07:00
committed by GitHub
parent 98f8e3eb5e
commit 23712beac2
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clr-k8s-examples/Vagrantfile
Vendored
+10 -2
View File
@@ -18,7 +18,7 @@ File.exists?("/usr/share/qemu/OVMF.fd") ? $loader = "/usr/share/qemu/OVMF.fd" :
$vm_name_prefix = "clr"
$base_ip = IPAddr.new("192.52.100.10")
$hosts = {}
$proxy_ip_list = ""
$proxy_ip_list = "192.168.121.0/24"
$driveletters = ('a'..'z').to_a
$setup_fc = true ? (['true', '1'].include? ENV['SETUP_FC'].to_s) : false
$runner = ENV.has_key?('RUNNER') ? ENV['RUNNER'].to_s : "containerd".to_s
@@ -82,7 +82,15 @@ Vagrant.configure("2") do |config|
if Vagrant.has_plugin?("vagrant-proxyconf")
c.proxy.http = (ENV['http_proxy']||ENV['HTTP_PROXY'])
c.proxy.https = (ENV['https_proxy']||ENV['HTTPS_PROXY'])
c.proxy.no_proxy = (ENV['no_proxy']+"#{$proxy_ip_list}" || ENV['NO_PROXY']+"#{$proxy_ip_list}" || "localhost,127.0.0.1,172.16.10.10#{$proxy_ip_list}")
if ENV['no_proxy'] || ENV['NO_PROXY']
if ENV['no_proxy']
c.proxy.no_proxy = (ENV['no_proxy']+","+"#{$proxy_ip_list}")
else
c.proxy.no_proxy = (ENV['NO_PROXY']+","+"#{$proxy_ip_list}")
end
else
c.proxy.no_proxy = "localhost,127.0.0.1,172.16.10.10,#{$proxy_ip_list}"
end
end
end
c.vm.provider :virtualbox do |_, override|