diff options
| -rw-r--r-- | manifests/puppetdb.pp | 6 | ||||
| -rw-r--r-- | manifests/puppetserver.pp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/manifests/puppetdb.pp b/manifests/puppetdb.pp index d55e682..2eaf01a 100644 --- a/manifests/puppetdb.pp +++ b/manifests/puppetdb.pp @@ -7,10 +7,4 @@ class profiles::puppetdb { listen_address => '::', disable_ssl => false, } - - if defined('puppetserver') and ! defined(Puppet::Config::Master['storeconfigs_backend']) { - puppet::config::master { 'storeconfigs_backend': - value => 'puppetdb', - } - } } diff --git a/manifests/puppetserver.pp b/manifests/puppetserver.pp index 205c3f4..6baed36 100644 --- a/manifests/puppetserver.pp +++ b/manifests/puppetserver.pp @@ -44,8 +44,14 @@ class profiles::puppetserver ( ], } - puppet::config::master { 'storeconfigs_backend': - value => 'puppetdb', + # This is the default value, and shouldn't have to be set (which is + # why theforeman-puppet module doesnt), but puppetlabs-puppetdb + # does, which forecus us into an infinite restart loop since + # the main config is constantly changed + if ! defined(Puppet::Config::Master['storeconfigs_backend']) { + puppet::config::master { 'storeconfigs_backend': + value => 'puppetdb', + } } class { 'puppetdb::master::config': |