From b004a9979fdbeea3baeea5c2dda1d15c542264a9 Mon Sep 17 00:00:00 2001 From: Nick Walker Date: Mon, 28 Nov 2016 13:24:40 -0800 Subject: [PATCH] Use puppetdb_gc module instead of gc-interval on puppetdb This commit adds the puppetdb_gc module which manages puppetdb garbage collection via cron jobs that run specific portions of pdb garbage collection at different intervals than the default in puppetdb which is to run all garbage collections queries at the same time. Part of implementing the module includes disable the gc-interval on puppetdb via hieradata. --- Puppetfile | 1 + hieradata/common.yaml | 3 +++ site/role/manifests/all_in_one_pe.pp | 1 + 3 files changed, 5 insertions(+) diff --git a/Puppetfile b/Puppetfile index 0610e887f..984723747 100644 --- a/Puppetfile +++ b/Puppetfile @@ -8,6 +8,7 @@ mod "puppetlabs/concat", '2.2.0' mod "puppet/hiera", '2.1.2' mod "npwalker/pe_code_manager_webhook", '1.0.12' mod "npwalker/pe_metric_curl_cron_jobs", '1.0.2' +mod "npwalker/puppetdb_gc", '0.9.0' # Modules from Github using various references # Further examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples diff --git a/hieradata/common.yaml b/hieradata/common.yaml index ea4151c30..09b719ae8 100644 --- a/hieradata/common.yaml +++ b/hieradata/common.yaml @@ -9,3 +9,6 @@ puppet_enterprise::master::code_manager::authenticate_webhook: false #https://docs.puppetlabs.com/pe/latest/console_config.html#tuning-the-classifier-synchronization-period #disable classifier scheduled sync and rely on r10k postrun command to sync the classes puppet_enterprise::profile::console::classifier_synchronization_period: 0 + +#disable gc-interval because we're using the puppetdb_gc module +puppet_enterprise::profile::puppetdb::gc_interval: 0 diff --git a/site/role/manifests/all_in_one_pe.pp b/site/role/manifests/all_in_one_pe.pp index b6b883e80..b8f7c7ad7 100644 --- a/site/role/manifests/all_in_one_pe.pp +++ b/site/role/manifests/all_in_one_pe.pp @@ -3,5 +3,6 @@ include profile::puppetmaster include pe_code_manager_webhook include pe_metric_curl_cron_jobs + include puppetdb_gc }