Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/310497
Change subject: base::puppet: add ca_server setting when needed
......................................................................
base::puppet: add ca_server setting when needed
Change-Id: Ic072bff9aa147aa5b505eb1ef8b3d68454d332a1
---
M modules/base/manifests/puppet.pp
M modules/base/templates/puppet.conf.d/10-main.conf.erb
2 files changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/310497/1
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 310f3e9..752c633 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -9,6 +9,7 @@
$crontime = $base::puppet::params::crontime
$freshnessinterval = $base::puppet::params::freshnessinterval
$use_srv_record = $base::puppet::params::use_srv_record
+ $ca_server = hiera('puppetmaster::ca_server', '')
package { [ 'puppet', 'facter' ]:
ensure => present,
diff --git a/modules/base/templates/puppet.conf.d/10-main.conf.erb
b/modules/base/templates/puppet.conf.d/10-main.conf.erb
index 452bfb1..c9c4946 100644
--- a/modules/base/templates/puppet.conf.d/10-main.conf.erb
+++ b/modules/base/templates/puppet.conf.d/10-main.conf.erb
@@ -16,6 +16,7 @@
srv_domain = <%= scope.lookupvar('::site') %>.wmnet
<%- else -%>
server = <%= @server %>
+<%- if @ca_server != '' -%>ca_server = <%= @ca_server %><%- end -%>
<%- end -%>
<% if @certname %>certname = <%= @certname %><% end %>
<% if @dns_alt_names %>dns_alt_names = <%= @dns_alt_names %><% end %>
--
To view, visit https://gerrit.wikimedia.org/r/310497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic072bff9aa147aa5b505eb1ef8b3d68454d332a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
