devsnack/control-repo
1
0
Fork 0
Code Releases Activity

Fix some quoting issues and add role:: to the include in site.pp

Browse Source
This commit is contained in:
Nick Walker 2015-08-13 15:41:11 -07:00
parent b0c5ac495c
commit 70690333ee
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/site.pp
View File

@ -41,7 +41,7 @@ node default {
#incude a role on any node that specifies it's role via a trusted fact at provision time #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/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 #https://docs.puppetlabs.com/puppet/latest/reference/ssl_attributes_extensions.html#aws-attributes-and-extensions-population-example
include $trusted['extensions']['pp_role'] include "role::${trusted['extensions']['pp_role']}"
# This is where you can declare classes for all nodes. # This is where you can declare classes for all nodes.
# Example: # Example:

6
site/profile/manifests/puppetmaster.pp
View File

@ -2,11 +2,11 @@ class profile::puppetmaster {
class { 'hiera': class { 'hiera':
hierarchy => [ hierarchy => [
"nodes/%{::trusted.certname}", "\"nodes/%{::trusted.certname}\"",
:common", "common",
], ],
hiera_yaml => '/etc/puppetlabs/code/hiera.yaml', hiera_yaml => '/etc/puppetlabs/code/hiera.yaml',
datadir => "/etc/puppetlabs/code/environments/%{environment}/hieradata", datadir => "\"/etc/puppetlabs/code/environments/%{environment}/hieradata\"",
owner => 'root', owner => 'root',
group => 'root', group => 'root',
} }