From 095f3ac4880caf0928ad7e16093f6bad7fb18f7e Mon Sep 17 00:00:00 2001 From: "christopher.lawrence" Date: Tue, 4 Feb 2020 16:54:15 +0000 Subject: [PATCH] updated site.pp with trusted roles --- Puppetfile | 1 + manifests/site.pp | 18 ++++++------------ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Puppetfile b/Puppetfile index ef9167d..317f65a 100644 --- a/Puppetfile +++ b/Puppetfile @@ -14,6 +14,7 @@ mod 'ghoneycutt-ssh', '3.61.0' mod 'puppet-selinux', '3.1.0' mod 'puppetlabs-puppetserver_gem', '1.1.1' mod 'puppetlabs-motd', '4.0.0' +mod 'puppetlabs-bootstrap', '2.0.0' # Modules from Git # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples diff --git a/manifests/site.pp b/manifests/site.pp index d4647b9..575f22e 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -30,17 +30,11 @@ node 'puppet' { } -#node default { - -# if $trusted['extentions']['pp_role'] { -# include ($trusted['extentions']['pp_role']) -# } else { -# include role::node -# } -#} - -node 'default' { - - include role::node +node default { + if $trusted['extensions']['pp_role'] { + include "role::${trusted['extensions']['pp_role']}" + } else { + include role::node + } }