vagrant: libvirt configuration. 84/684/2
authorJeff Shaw <jeffrey.b.shaw@intel.com>
Tue, 5 Apr 2016 17:23:17 +0000 (10:23 -0700)
committerGerrit Code Review <gerrit@fd.io>
Mon, 11 Apr 2016 21:02:00 +0000 (21:02 +0000)
Configure the proxy, vcpu, and memory parameters for the libvirt provider.

Change-Id: Id662e60f76b4b424d3a5d98929a44ef2587ef258
Signed-off-by: Jeff Shaw <jeffrey.b.shaw@intel.com>
build-root/vagrant/Vagrantfile

index 1f6a3b9..6e42bf2 100644 (file)
@@ -49,8 +49,8 @@ Vagrant.configure(2) do |config|
 
   # use http proxy if avaiable
   if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf")
 
   # 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
 
    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 "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"
   config.vm.provider "vmware_workstation" do |vws,override|
     vws.vmx["memsize"] = "8192"
     vws.vmx["numvcpus"] = "4"