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 } 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",