From f54d9aff824791bea170268f5f7fbcf7c1a42d2f Mon Sep 17 00:00:00 2001
From: Jonathan Lent <jlent@stanford.edu>
Date: Mon, 11 Jan 2016 10:25:57 -0800
Subject: [PATCH] [puppetclient] fixing template related to Puppet 2.X hosts
---
templates/puppetclient/puppet.conf.template.erb | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/templates/puppetclient/puppet.conf.template.erb b/templates/puppetclient/puppet.conf.template.erb
index 593a3db..63bd8ad 100644
--- a/templates/puppetclient/puppet.conf.template.erb
+++ b/templates/puppetclient/puppet.conf.template.erb
@@ -26,27 +26,21 @@
pserver = server
elsif (is_master) then
pserver = fqdn
- elsif (hostname =~ /^frankoz\d(-(test|new|build|old))?$/) then
- pserver = 'jimhenson1.stanford.edu'
- elsif (puppet3) then
+ else
if (hostname =~ /^(puppetrepo-dev|puppetdb-dev).*$/) then
pserver = 'puppetservice1-dev.stanford.edu'
else
pserver = 'puppetservice.stanford.edu'
end
- else
- pserver = 'jimhenson.stanford.edu'
- end
+ end
# Figure out what Puppet CA service to use.
if (ca_server != '') then
pca_server = ca_server
elsif (hostname =~ /^(puppetservice.*dev|puppetrepo-dev|puppetdb-dev).*$/) then
pca_server = 'puppetca-dev.stanford.edu'
- elsif (puppet3) then
- pca_server = 'puppetrepo.stanford.edu'
else
- pca_server = 'puppetca.stanford.edu'
+ pca_server = 'puppetrepo.stanford.edu'
end
--
GitLab