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 | f9fa240c5227020dd10c6f1f309afba1d5a75c1e (patch) | |
| tree | da2aec15c8f9d0a7ea66397ba9f6f75e124e3123 | |
| parent | ed6bb4f9fa972096ca599198c0ed662a8ab01b1e (diff) | |
| download | debian-f9fa240c5227020dd10c6f1f309afba1d5a75c1e.tar.gz debian-f9fa240c5227020dd10c6f1f309afba1d5a75c1e.tar.bz2 | |
Squashed 'puppet/' changes from f8e88d3..26c7b4f
26c7b4f TODO update
6693b05 Fixing hiera config
git-subtree-dir: puppet
git-subtree-split: 26c7b4f4552ee0aabbdf609d4a1e2eb6a4971068
| -rw-r--r-- | TODO.md | 1 | ||||
| -rw-r--r-- | Vagrantfile | 9 | ||||
| -rw-r--r-- | hiera/hiera.yaml | 2 |
3 files changed, 8 insertions, 4 deletions
@@ -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 e7404a9..8999cf0 100644 --- 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 0a23dec..33acc9e 100644 --- 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}' |