Merge remote-tracking branch 'yuvipanda/vagrant-fixes' into develop

Conflicts:
	Vagrantfile

Change-Id: I0500e0deb7697ff39a7856878c5e6e867c633469

1 files changed, 4 insertions, 3 deletions

diff --git a/Vagrantfile b/Vagrantfile
index 2d9b473e..c9c68284 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-Vagrant.configure("2") do |config|
-  config.vm.define :node1 do |config|
+Vagrant.configure("2") do |vagrant_config|
+  vagrant_config.vm.define :node1 do |config|
 
     # Please verify the sha512 sum of the downloaded box before importing it into vagrant !
     # see https://leap.se/en/docs/platform/details/development#Verify.vagrantbox.download
@@ -10,13 +10,14 @@ Vagrant.configure("2") do |config|
     config.vm.box = "LEAP/wheezy"
     #config.vm.network :private_network, ip: "10.5.5.102"
     config.vm.provider "virtualbox" do |v|
+      v.memory = 1024
       v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
       v.name = "node1"
     end
 
     config.vm.provision "puppet" do |puppet|
       puppet.manifests_path = "./vagrant"
-      puppet.module_path = "./puppet/modules" 
+      puppet.module_path = "./puppet/modules"
       puppet.manifest_file = "install-platform.pp"
       puppet.options = "--verbose"
     end