summaryrefslogtreecommitdiff
path: root/Vagrantfile
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-10-01 13:05:34 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-10-01 13:05:34 -0300
commit587f206824274d7d1cfcb1072ea8f818493bd317 (patch)
tree17c350a4ce73a064218969defd2ef8bdf87249d3 /Vagrantfile
parent529cd5077e3d76c1d5b612bc146ab174d7143c30 (diff)
downloaddebian-587f206824274d7d1cfcb1072ea8f818493bd317.tar.gz
debian-587f206824274d7d1cfcb1072ea8f818493bd317.tar.bz2
Squashed 'puppet/' changes from bb2eae6..2979f23
2979f23 Updating mrconfig 6f77549 Updating Vagrantfile 6848013 Use git clone --recursive for puppet modules git-subtree-dir: puppet git-subtree-split: 2979f23a78bb7ce96599904547502c2c922b45d4
Diffstat (limited to 'Vagrantfile')
-rw-r--r--Vagrantfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Vagrantfile b/Vagrantfile
index efaa952..e7404a9 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,7 +13,7 @@ Vagrant::Config.run do |config|
puppet.manifest_file = "bootstrap/vagrant.pp"
puppet.manifests_path = "puppet/manifests"
puppet.module_path = "puppet/modules"
- puppet.pp_path = "/etc/puppet"
+ puppet.temp_dir = "/etc/puppet"
end
# Define a Host VM