diff --git a/manifests/maintenance/pg_repack.pp b/manifests/maintenance/pg_repack.pp index 100461a..8b79df6 100644 --- a/manifests/maintenance/pg_repack.pp +++ b/manifests/maintenance/pg_repack.pp @@ -26,7 +26,9 @@ $repack_jobs = "--jobs ${jobs}" $facts_tables = '-t factsets -t fact_paths"' - $catalogs_tables = '-t catalogs -t catalog_resources -t edges -t certnames"' + $catalogs_tables = versioncmp($facts['pe_server_version'], '2019.8.1') ? { + 1 => '-t catalogs -t catalog_resources -t catalog_inputs -t edges -t certnames"', + default => '-t catalogs -t catalog_resources -t edges -t certnames"' } $other_tables = '-t producers -t resource_params -t resource_params_cache"' $reports_table = '-t reports"' $resource_events_table = '-t resource_events"' diff --git a/spec/classes/maintenance/pg_repack_spec.rb b/spec/classes/maintenance/pg_repack_spec.rb index 32e896b..fc02821 100644 --- a/spec/classes/maintenance/pg_repack_spec.rb +++ b/spec/classes/maintenance/pg_repack_spec.rb @@ -71,6 +71,17 @@ ' -d pe-puppetdb --jobs 2 -t resource_events" > /var/log/puppetlabs/pe_databases_cron/resource_events_repack.log 2>&1') } end + context 'on >= PE 2019.8.2' do + before :each do + facts['pe_server_version'] = '2019.8.2' + facts['pe_postgresql_info']['installed_server_version'] = 11 + end + it { + is_expected.to contain_cron('pg_repack catalogs tables') + .with_command('su - pe-postgres -s /bin/bash -c "/opt/puppetlabs/server/apps/postgresql/11/bin/pg_repack'\ + ' -d pe-puppetdb --jobs 2 -t catalogs -t catalog_resources -t catalog_inputs -t edges -t certnames" > /var/log/puppetlabs/pe_databases_cron/catalogs_repack.log 2>&1') + } + end end end end