From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 20 Mar 2017 14:15:29 +0000 (+0000)
Subject: Do not hardcode "handel" in template - use puppetmaster role instead
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4c586fe7620af4ba1e06b8f4e05251efe577cf06;p=mirror%2Fdsa-puppet.git

Do not hardcode "handel" in template - use puppetmaster role instead
---

diff --git a/modules/debian_org/templates/puppet.conf.erb b/modules/debian_org/templates/puppet.conf.erb
index 319c47db7..e0947269e 100644
--- a/modules/debian_org/templates/puppet.conf.erb
+++ b/modules/debian_org/templates/puppet.conf.erb
@@ -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