From cadc24e843fc81a2ab66c1c671d523da9f1facd9 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Sun, 4 Sep 2016 11:49:25 +0200 Subject: [PATCH 1/2] do not include the full puppetdb, but only the master config class it is absolutely reasonable to install the puppetdb master config through this module, but not the full puppetdb installation. It is up to the admin to decide if he wants his puppetmaster to be also a puppetdb node, and with postgres in the same machine or not --- manifests/server.pp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/manifests/server.pp b/manifests/server.pp index 2927b75..eb8d13e 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -74,7 +74,7 @@ # Default: undef # # [*manage_puppetdb*] -# Whether to manage puppetdb through puppetlabs/puppetdb module +# Whether to manage puppetdb master config through puppetlabs/puppetdb module # Default: false # # [*report_dir*] @@ -228,12 +228,7 @@ } } - # enable basic puppetdb using the puppetlabs-puppetdb module - # this will also install postgresql - # for more detailed control over puppetdb settings, use the puppetdb - # module directly rather than having puppet-puppet include it. if $manage_puppetdb { - include puppetdb include puppetdb::master::config } From a23d9496046c402cdca2028b934786c0f84e2d36 Mon Sep 17 00:00:00 2001 From: Theo Chatzimichos Date: Sat, 8 Apr 2017 18:36:30 +0200 Subject: [PATCH 2/2] bump the puppetdb module requirement in metadata.json --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index ca09d1c..6e3dbd0 100644 --- a/metadata.json +++ b/metadata.json @@ -38,7 +38,7 @@ }, { "name": "puppetlabs/puppetdb", - "version_requirement": ">= 4.1.0 <5.0.0" + "version_requirement": ">= 5.0.0 <6.0.0" }, { "name": "puppetlabs/stdlib",