Squashed 'puppet/' changes from f8e88d3..26c7b4f

26c7b4f TODO update
6693b05 Fixing hiera config

git-subtree-dir: puppet
git-subtree-split: 26c7b4f4552ee0aabbdf609d4a1e2eb6a4971068

diff --git a/TODO.md b/TODO.md
index 1cb987ffc58f75fe284eb661f72b9aecde7f92bd..c773654fbbac64502ca38c20cb5950f560239d1c 100644 (file)
--- a/TODO.md
+++ b/TODO.md
@@ -1,6 +1,7 @@
 TODO
 ====
 
+* Minimal manifest for fast provisioning.
 * Update to new nodo style (hiera and nodo::role).
 * Support for recursive clones in `bin/mrconfig`.
 * Test!

diff --git a/Vagrantfile b/Vagrantfile
index e7404a96d97f67ecc3a321777fcc68409774f0c5..8999cf010b9e987076ddbcfae39cb0c2046e7b2b 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,10 +10,11 @@ Vagrant::Config.run do |config|
 
   # Enable provisioning with Puppet stand alone.
   config.vm.provision :puppet do |puppet|
-    puppet.manifest_file  = "bootstrap/vagrant.pp"
-    puppet.manifests_path = "puppet/manifests"
-    puppet.module_path    = "puppet/modules"
-    puppet.temp_dir       = "/etc/puppet"
+    puppet.manifest_file     = "bootstrap/vagrant.pp"
+    puppet.manifests_path    = "puppet/manifests"
+    puppet.module_path       = "puppet/modules"
+    puppet.temp_dir          = "/etc/puppet"
+    puppet.working_directory = "/etc/puppet"
   end
 
   # Define a Host VM

diff --git a/hiera/hiera.yaml b/hiera/hiera.yaml
index 0a23dec504a0d8840bbd0aa437ffd2b2cb2994bd..33acc9e4c0a25731961eabf40abc04193d963841 100644 (file)
--- a/hiera/hiera.yaml
+++ b/hiera/hiera.yaml
@@ -6,6 +6,8 @@
   # a relative datadir. For it to work, we were forced to
   # create a manifests/hiera symlink. This should be
   # reconsidered in the future.
+  #
+  # See http://docs.vagrantup.com/v2/provisioning/puppet_apply.html
   :datadir: hiera
 :hierarchy:
   - '%{::environment}/domain/%{::domain}/node/%{::clientcert}'