git.lirion.de

Of git, get, and gud

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormail_redacted_for_web 2016-01-06 15:19:06 -0800
committermail_redacted_for_web 2016-01-06 15:26:08 -0800
commit508b9cc6007d508b1c30a7cea1232c48cac3f133 (patch)
tree21e6cf466a3983d65dbf937dcb2f2fbeb79892e8
parent9a876a61e730f1c17063ad0593c3b37625503b5e (diff)
downloadcontrol-repo-template-508b9cc6007d508b1c30a7cea1232c48cac3f133.tar.bz2
Move hiera_config to main section of puppet.conf
If it is in master instead of main then puppet apply will give a warning.
-rw-r--r--site/profile/manifests/puppetmaster.pp11
1 files changed, 10 insertions, 1 deletions
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
index d73236f..8a1b161 100644
--- a/site/profile/manifests/puppetmaster.pp
+++ b/site/profile/manifests/puppetmaster.pp
@@ -15,9 +15,18 @@ class profile::puppetmaster {
notify => Service['pe-puppetserver'],
}
- ini_setting { 'puppet.conf hiera_config' :
+ ini_setting { 'puppet.conf hiera_config main section' :
ensure => present,
path => "${::settings::confdir}/puppet.conf",
+ section => 'main',
+ setting => 'hiera_config',
+ value => $hiera_yaml,
+ notify => Service['pe-puppetserver'],
+ }
+
+ ini_setting { 'puppet.conf hiera_config master section' :
+ ensure => absent,
+ path => "${::settings::confdir}/puppet.conf",
section => 'master',
setting => 'hiera_config',
value => $hiera_yaml,