Do not hardcode "handel" in template - use puppetmaster role instead
authorPeter Palfrader <peter@palfrader.org>
Mon, 20 Mar 2017 14:15:29 +0000 (14:15 +0000)
committerPeter Palfrader <peter@palfrader.org>
Mon, 20 Mar 2017 14:15:29 +0000 (14:15 +0000)
modules/debian_org/templates/puppet.conf.erb

index 319c47d..e094726 100644 (file)
@@ -13,8 +13,7 @@ pluginsync=true
 # This is the default environment for all clients
 environment=production
 
-<%- if scope.lookupvar('::hostname') == 'handel' -%>
-
+<% if scope.function_has_role(['puppetmaster']) %>
 [master]
 environmentpath=/srv/puppet.debian.org/stages
 cadir  = /var/lib/puppet/ssl/ca