summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-07-14 15:44:33 +0200
committervarac <varacanero@zeromail.org>2015-07-14 15:44:33 +0200
commit75b2a9693832c266d8b893aa1de4f6da8e924400 (patch)
treef094108df6b2a02ad03959c9f5b6593545e1caae
parent2adbf36f656b68ef09f1d6dafdc9f1b8f99d8080 (diff)
parent2bb4f3d3c350aaac569f0c6a8c7935f4c35ecfee (diff)
Merge remote-tracking branch 'yuvipanda/vagrant-fixes' into develop
Conflicts: Vagrantfile Change-Id: I0500e0deb7697ff39a7856878c5e6e867c633469
-rw-r--r--Vagrantfile7
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