add puppetserver 5 to README

also fixup parameter documentation in server.pp
theforeman · Jul 12, 2017 · 2e1b7c1 · 2e1b7c1
1 parent fdfd935
commit 2e1b7c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -179,7 +179,8 @@ version available.
 
 Currently supported values and configuration behaviours are:
 
-* `2.7.x` (default) - creates `product.conf`
+* `5.0.0` (default for Puppet >= 5) - configures metrics service and `/puppet/experimental` route
+* `2.7.x` (default for Puppet < 5) - creates `product.conf`
 * `2.5.x`, `2.6.x` - configures the certificate authority in `ca.cfg`
 * `2.4.99` - configures for both 2.4 and 2.5, with `bootstrap.cfg`
   and `ca.cfg`

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -300,9 +300,10 @@
 #
 # $puppetserver_jruby9k::      For Puppetserver 5, use JRuby 9k? Defaults to false
 #
-# $puppetserver_metrics::      For Puppetserver 5, enable metrics? Defaults to true
+# $puppetserver_metrics::      Enable metrics (Puppetserver 5.x only) and JRuby profiling?
+#                              Defaults to true on Puppetserver 5.x and to false on Puppetserver 2.x
 #
-# $puppetserver_experimental:: For Puppetserver 5, enable metrics? Defaults to true
+# $puppetserver_experimental:: For Puppetserver 5, enable the /puppet/experimental route? Defaults to true
 #
 class puppet::server(
   Variant[Boolean, Stdlib::Absolutepath] $autosign = $::puppet::autosign,