Commit f54d9aff authored by Jonathan Lent's avatar Jonathan Lent

[puppetclient] fixing template related to Puppet 2.X hosts

parent 8d14785b
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment