git.lirion.de

Of git, get, and gud

summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormail_redacted_for_web 2015-08-13 15:41:11 -0700
committermail_redacted_for_web 2015-08-13 15:41:11 -0700
commit70690333eedbb28b3f286912e6d9749b4a7e2618 (patch)
tree35cb48b0b73e2841936efd4cd43c13d56cd002ee
parentb0c5ac495c40e6208460afaedd2ae5b8b1cb954f (diff)
downloadcontrol-repo-template-70690333eedbb28b3f286912e6d9749b4a7e2618.tar.bz2
Fix some quoting issues and add role:: to the include in site.pp
-rw-r--r--manifests/site.pp2
-rw-r--r--site/profile/manifests/puppetmaster.pp6
2 files changed, 4 insertions, 4 deletions
diff --git a/manifests/site.pp b/manifests/site.pp
index cc02727..5ba0af4 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,7 +41,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
- include $trusted['extensions']['pp_role']
+ include "role::${trusted['extensions']['pp_role']}"
# This is where you can declare classes for all nodes.
# Example:
diff --git a/site/profile/manifests/puppetmaster.pp b/site/profile/manifests/puppetmaster.pp
index 8242110..b22500c 100644
--- a/site/profile/manifests/puppetmaster.pp
+++ b/site/profile/manifests/puppetmaster.pp
@@ -2,11 +2,11 @@ class profile::puppetmaster {
class { 'hiera':
hierarchy => [
- "nodes/%{::trusted.certname}",
- :common",
+ "\"nodes/%{::trusted.certname}\"",
+ "common",
],
hiera_yaml => '/etc/puppetlabs/code/hiera.yaml',
- datadir => "/etc/puppetlabs/code/environments/%{environment}/hieradata",
+ datadir => "\"/etc/puppetlabs/code/environments/%{environment}/hieradata\"",
owner => 'root',
group => 'root',
}