summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Shaw <jeffrey.b.shaw@intel.com>2016-04-05 10:23:17 -0700
committerGerrit Code Review <gerrit@fd.io>2016-04-11 21:02:00 +0000
commitecec279029a8a507483bc54ace3dca7f623f3fb7 (patch)
tree6e438b230af7f466fa35033bf4cd3a81727dfac4
parente41b49490dc8699fd781480a4cc8bde858f91f5a (diff)
vagrant: libvirt configuration.
Configure the proxy, vcpu, and memory parameters for the libvirt provider. Change-Id: Id662e60f76b4b424d3a5d98929a44ef2587ef258 Signed-off-by: Jeff Shaw <jeffrey.b.shaw@intel.com>
-rw-r--r--build-root/vagrant/Vagrantfile8
1 files changed, 6 insertions, 2 deletions
diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile
index 1f6a3b9c00d..6e42bf272ca 100644
--- a/build-root/vagrant/Vagrantfile
+++ b/build-root/vagrant/Vagrantfile
@@ -49,8 +49,8 @@ Vagrant.configure(2) do |config|
# 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.http = ENV['http_proxy']
+ config.proxy.https = ENV['https_proxy']
config.proxy.no_proxy = "localhost,127.0.0.1"
end
@@ -61,6 +61,10 @@ Vagrant.configure(2) do |config|
config.vm.provider "vmware_fusion" do |fusion,override|
fusion.vmx["memsize"] = "4096"
end
+ config.vm.provider "libvirt" do |lv|
+ lv.memory = 4096
+ lv.cpus = 8
+ end
config.vm.provider "vmware_workstation" do |vws,override|
vws.vmx["memsize"] = "8192"
vws.vmx["numvcpus"] = "4"