diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-10-24 15:19:44 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-10-24 15:19:44 -0200 |
| commit | db66846f49ce58114c5828f7b7104f3d4db17536 (patch) | |
| tree | 4ebb09141cbceab34f8128ce210bb058c77a6722 | |
| parent | d51dd7f5188cf0607755164c6b8720278bb07066 (diff) | |
| parent | f9fa240c5227020dd10c6f1f309afba1d5a75c1e (diff) | |
| download | debian-db66846f49ce58114c5828f7b7104f3d4db17536.tar.gz debian-db66846f49ce58114c5828f7b7104f3d4db17536.tar.bz2 | |
Merge commit 'f9fa240c5227020dd10c6f1f309afba1d5a75c1e'
| -rw-r--r-- | puppet/TODO.md | 1 | ||||
| -rw-r--r-- | puppet/Vagrantfile | 9 | ||||
| -rw-r--r-- | puppet/hiera/hiera.yaml | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/puppet/TODO.md b/puppet/TODO.md index 1cb987f..c773654 100644 --- a/puppet/TODO.md +++ b/puppet/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/puppet/Vagrantfile b/puppet/Vagrantfile index e7404a9..8999cf0 100644 --- a/puppet/Vagrantfile +++ b/puppet/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/puppet/hiera/hiera.yaml b/puppet/hiera/hiera.yaml index 0a23dec..33acc9e 100644 --- a/puppet/hiera/hiera.yaml +++ b/puppet/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}' |