git.lirion.de

Of git, get, and gud

summaryrefslogtreecommitdiffstats
path: root/manifests/site.pp
diff options
context:
space:
mode:
authormail_redacted_for_web 2015-12-07 08:03:13 -0800
committermail_redacted_for_web 2015-12-18 09:24:27 -0800
commit2ed03892d9c9205cc3d5b624c648e4dca9e5b2b6 (patch)
treefb8327b92c1e8ddc253542759206c68df73c8c4c /manifests/site.pp
parentcc34e25fd54e60caf744130d90c14f8d839c7823 (diff)
downloadcontrol-repo-template-2ed03892d9c9205cc3d5b624c648e4dca9e5b2b6.tar.bz2
Disable file bucket to match default PE2015.3 behavior
Diffstat (limited to 'manifests/site.pp')
-rw-r--r--manifests/site.pp19
1 files changed, 4 insertions, 15 deletions
diff --git a/manifests/site.pp b/manifests/site.pp
index 65650cf..04b3d6e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -11,20 +11,9 @@
## Active Configurations ##
-# PRIMARY FILEBUCKET
-# This configures puppet agent and puppet inspect to back up file contents when
-# they run. The Puppet Enterprise console needs this to display file contents
-# and differences.
-
-# Define filebucket 'main':
-filebucket { 'main':
- #server should point to one master that will be the file bucket
- server => "${settings::server}",
- path => false,
-}
-
-# Make filebucket 'main' the default backup location for all File resources:
-File { backup => 'main' }
+# Disable filebucket by default for all File resources:
+#http://docs.puppetlabs.com/pe/latest/release_notes.html#filebucket-resource-no-longer-created-by-default
+File { backup => false }
# DEFAULT NODE
# Node definitions in this file are merged with node data from the console. See
@@ -40,7 +29,7 @@ node default {
#incude a role on any node that specifies it's role via a trusted fact at provision time
#https://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html#trusted-facts
#https://docs.puppetlabs.com/puppet/latest/reference/ssl_attributes_extensions.html#aws-attributes-and-extensions-population-example
-
+
if !empty( $trusted['extensions']['pp_role'] ) {
include "role::${trusted['extensions']['pp_role']}"
}