summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2015-12-14 23:28:14 +0000
committerGerrit Code Review <gerrit@projectrotterdam.info>2015-12-14 23:28:14 +0000
commit3c6155c7b37c9674952ba62ba09b66d131007bb9 (patch)
tree5a7f3edf36c1ef064c7490d2ac49fbfa89d0e094
parent539cff0356a26db4043012402f867a6c0e990bee (diff)
parentb73f2675c79e2a5eed198579bb181bbb472d4817 (diff)
Merge "Fix to make it easy to use http proxy with Vagrant"
-rw-r--r--build-root/vagrant/Vagrantfile7
1 files changed, 7 insertions, 0 deletions
diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile
index 9c61dd33af2..4e2669b513a 100644
--- a/build-root/vagrant/Vagrantfile
+++ b/build-root/vagrant/Vagrantfile
@@ -22,6 +22,13 @@ Vagrant.configure(2) do |config|
config.cache.scope = :box
end
+ # use http proxy if avaiable
+ if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf")
+ config.proxy.http = "$http_proxy"
+ config.proxy.https = "$https_proxy"
+ config.proxy.no_proxy = "localhost,127.0.0.1"
+ end
+
config.vm.synced_folder "../../", "/vpp", disabled: false
config.vm.provider "virtualbox" do |vb|
vb.memory = "4096"