diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2014-10-07 16:17:45 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2014-10-07 16:17:45 -0300 |
| commit | 6693b05464a5e37ec0adb9d82ead8185c15e5070 (patch) | |
| tree | 937bb0407feece7dbf42f59775bd9c6ea41f6731 | |
| parent | f8e88d3e5637cb560629bead885861e5d4a4bd89 (diff) | |
| download | puppet-bootstrap-6693b05464a5e37ec0adb9d82ead8185c15e5070.tar.gz puppet-bootstrap-6693b05464a5e37ec0adb9d82ead8185c15e5070.tar.bz2 | |
Fixing hiera config
| -rw-r--r-- | Vagrantfile | 9 | ||||
| -rw-r--r-- | hiera/hiera.yaml | 2 |
2 files changed, 7 insertions, 4 deletions
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}' |