diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-09-01 11:54:27 -0700 |
|---|---|---|
| committer |   Dave Wallace <dwallacelf@gmail.com> | 2016-09-02 02:05:57 +0000 |
| commit | 3ba4d36d927444cfd1929c3d130af7dc9194ea6c (patch) | |
| tree | 3fcd9cc58fff10f1af5c8e5a8fa70d701e1c2942 /build-root/vagrant/Vagrantfile | |
| parent | 16bcf7d8dcd411e6a6b8d217cce5e450f7357bb3 (diff) | |
VPP-373: stop building from /vpp mount
Change-Id: I7f8fe8fa6c24b4229b0cb45e6c83e7cb2828e2da
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'build-root/vagrant/Vagrantfile')
| -rw-r--r-- | build-root/vagrant/Vagrantfile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build-root/vagrant/Vagrantfile b/build-root/vagrant/Vagrantfile index 641397e82ba..47709033435 100644 --- a/build-root/vagrant/Vagrantfile +++ b/build-root/vagrant/Vagrantfile @@ -14,8 +14,9 @@ Vagrant.configure(2) do |config| config.vm.box_check_update = false config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"update.sh") - config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"build.sh"), :args => "/vpp vagrant" - config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"install.sh"), :args => "/vpp" + config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"clone.sh") + config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"build.sh"), :args => "/home/vagrant/git/vpp vagrant" + config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"install.sh"), :args => "/home/vagrant/git/vpp" config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"clearinterfaces.sh") config.vm.provision :shell, :path => File.join(File.dirname(__FILE__),"run.sh") @@ -59,8 +60,11 @@ Vagrant.configure(2) do |config| vmcpu=(ENV['VPP_VAGRANT_VMCPU'] || 2) vmram=(ENV['VPP_VAGRANT_VMRAM'] || 4096) - + + config.ssh.forward_agent = true + config.vm.synced_folder "../../", "/vpp", disabled: false + config.vm.provider "virtualbox" do |vb| vb.customize ["modifyvm", :id, "--ioapic", "on"] vb.memory = "#{vmram}" |