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

Fixed vagrant issue with proxy

Browse Source 
proxy_ip_list variable had scope issues, used as global variable
initially then as a local variable. Changed all to global.

Signed-off-by: root <root@csterret-desk1.amr.corp.intel.com>
This commit is contained in:
root
2019-08-08 18:19:20 -07:00
committed by Ganesh Maharaj Mahalingam
parent 9f4ffb2e39
commit a29f8b7b71
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clr-k8s-examples/Vagrantfile
Vendored
+2 -2
View File
@@ -60,7 +60,7 @@ Vagrant.configure("2") do |config|
end
$hosts.each do |vm_name, ip|
proxy_ip_list = ("#{proxy_ip_list},#{vm_name},#{ip}")
$proxy_ip_list = ("#{$proxy_ip_list},#{vm_name},#{ip}")
end
$hosts.each do |vm_name, ip|
@@ -81,7 +81,7 @@ 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}")
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}")
end
end
c.vm.provision "shell", privileged: false, path: "setup_system.sh", env: {"RUNNER" => $runner}