diff options
| author | mail_redacted_for_web | 2015-12-11 18:22:22 -0800 |
|---|---|---|
| committer | mail_redacted_for_web | 2015-12-18 09:24:27 -0800 |
| commit | b8d4980f86eecda72928de0e9f28c32e9078d117 (patch) | |
| tree | 1f612f1c8cfd3f3c5441f0d28c730a677613c578 | |
| parent | 5dcdf019634070e8f52b53f32074b3d14f4555f3 (diff) | |
| download | control-repo-template-b8d4980f86eecda72928de0e9f28c32e9078d117.tar.bz2 | |
Move hiera.yaml to avoid file-sync overwriting it
File sync appears to sync everything in the $codedir which
inlcudes hiera.yaml. When managing hiera.yaml with puppet code
you don't want file sync to overwrite its contents. So, I'm
moving it out of $codedir and removing the original hiera.yaml
to avoid confusion for users investigating later.
| -rw-r--r-- | site/profile/manifests/puppetmaster.pp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp index 28b3bdf..d73236f 100644 --- a/site/profile/manifests/puppetmaster.pp +++ b/site/profile/manifests/puppetmaster.pp @@ -1,18 +1,36 @@ class profile::puppetmaster { + $hiera_yaml = "${::settings::confdir}/hiera.yaml" + class { 'hiera': hierarchy => [ 'virtual/%{::virtual}', 'nodes/%{::trusted.certname}', 'common', ], - hiera_yaml => '/etc/puppetlabs/code/hiera.yaml', + hiera_yaml => $hiera_yaml, datadir => '/etc/puppetlabs/code/environments/%{environment}/hieradata', owner => 'pe-puppet', group => 'pe-puppet', notify => Service['pe-puppetserver'], } + ini_setting { 'puppet.conf hiera_config' : + ensure => present, + path => "${::settings::confdir}/puppet.conf", + section => 'master', + setting => 'hiera_config', + value => $hiera_yaml, + notify => Service['pe-puppetserver'], + } + + #remove the default hiera.yaml from the code-staging directory + #after the next code manager deployment it should be removed + #from the live codedir + file { '/etc/puppetlabs/code-staging/hiera.yaml' : + ensure => absent, + } + #Lay down update-classes.sh for use in r10k postrun_command #This is configured via the pe_r10k::postrun key in hiera file { '/usr/local/bin/update-classes.sh' : |