diff options
| author | mail_redacted_for_web | 2016-01-11 09:23:19 -0800 |
|---|---|---|
| committer | mail_redacted_for_web | 2016-01-11 09:23:19 -0800 |
| commit | 323b4b9386191c0f0761f03267f7eab840740227 (patch) | |
| tree | 21e6cf466a3983d65dbf937dcb2f2fbeb79892e8 | |
| parent | 9a876a61e730f1c17063ad0593c3b37625503b5e (diff) | |
| parent | 508b9cc6007d508b1c30a7cea1232c48cac3f133 (diff) | |
| download | control-repo-template-323b4b9386191c0f0761f03267f7eab840740227.tar.bz2 | |
Merge pull request #12 from npwalker/move_hiera_config_setting
Move hiera_config to main section of puppet.conf
| -rw-r--r-- | site/profile/manifests/puppetmaster.pp | 11 |
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, |