From e2c5d0703c5e62a2b27e1f923ef7857082392176 Mon Sep 17 00:00:00 2001
From: Graham Hayes <graham.hayes@hpe.com>
Date: Mon, 9 May 2016 20:36:56 +0100
Subject: [PATCH] Fix the memory of the VM in VirtualBox

Also mount the grenade folder where it exists

Change-Id: I7abf586b1280599c5954b641c95efaea1fd9cbc3
---
 contrib/vagrant/Vagrantfile | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/contrib/vagrant/Vagrantfile b/contrib/vagrant/Vagrantfile
index be508d714..017dbdd1e 100644
--- a/contrib/vagrant/Vagrantfile
+++ b/contrib/vagrant/Vagrantfile
@@ -3,6 +3,8 @@ GITCONFIG = `cat $HOME/.gitconfig`
 
 Vagrant.require_version ">= 1.5"
 
+VM_RAM_SIZE = "8192"
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.ssh.forward_agent = true
 
@@ -10,7 +12,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.network "forwarded_port", guest: 5354, host: 5354, protocol: "udp"
 
   config.vm.provider "virtualbox" do |vb, override|
-    vb.customize ["modifyvm", :id, "--memory", "2048"]
+    vb.customize ["modifyvm", :id, "--memory", VM_RAM_SIZE]
     if not RUBY_PLATFORM.downcase.include?("mswin")
       vb.customize ["modifyvm", :id, "--cpus", `awk "/^processor/ {++n} END {print n}" /proc/cpuinfo 2> /dev/null || sh -c 'sysctl hw.logicalcpu 2> /dev/null || echo ": 2"' | awk \'{print \$2}\' `.chomp ]
     end
@@ -34,6 +36,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       override.vm.synced_folder "../../../devstack", "/home/vagrant/devstack"
     end
 
+    if File.directory?("../../../grenade")
+      override.vm.synced_folder "../../../grenade", "/opt/stack/grenade"
+    end
+
     if File.directory?("../../../tempest")
       override.vm.synced_folder "../../../tempest", "/opt/stack/tempest"
     end
@@ -46,7 +52,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provider :libvirt do |lv, override|
     lv.graphics_ip = '0.0.0.0'
     lv.nested = true
-    lv.memory = 8192
+    lv.memory = Integer(VM_RAM_SIZE)
     if not RUBY_PLATFORM.downcase.include?("mswin")
       lv.cpus = `awk "/^processor/ {++n} END {print n}" /proc/cpuinfo 2> /dev/null || sh -c 'sysctl hw.logicalcpu 2> /dev/null || echo ": 2"' | awk \'{print \$2}\' `.chomp
     end
@@ -66,6 +72,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       override.vm.synced_folder "../../../designate-tempest-plugin", "/opt/stack/designate-tempest-plugin", type: "nfs"
     end
 
+    if File.directory?("../../../grenade")
+      override.vm.synced_folder "../../../grenade", "/opt/stack/grenade", type: "nfs"
+    end
+
     if File.directory?("../../../devstack")
       override.vm.synced_folder "../../../devstack", "/home/vagrant/devstack", type: "nfs"
     end