Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/206132
Change subject: dsh: remove template from scap-proxies and just use join()
......................................................................
dsh: remove template from scap-proxies and just use join()
Extra layer of abstraction isn't really useful here
Change-Id: I5303c5278fbc1609d3d9409e841de6c15652c34e
---
M modules/dsh/manifests/config.pp
D modules/dsh/templates/scap-proxies.erb
2 files changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/206132/1
diff --git a/modules/dsh/manifests/config.pp b/modules/dsh/manifests/config.pp
index 78963f1..32f92be 100644
--- a/modules/dsh/manifests/config.pp
+++ b/modules/dsh/manifests/config.pp
@@ -21,7 +21,7 @@
}
file { '/etc/dsh/group/scap-proxies':
- content => template('dsh/scap-proxies.erb'),
+ content => join($scap_proxies, '\n'),
owner => 'root',
group => 'root',
mode => '0444',
diff --git a/modules/dsh/templates/scap-proxies.erb
b/modules/dsh/templates/scap-proxies.erb
deleted file mode 100644
index a491629..0000000
--- a/modules/dsh/templates/scap-proxies.erb
+++ /dev/null
@@ -1,4 +0,0 @@
-# Scap proxies should typically be one for row where appservers are located.
-<% @scap_proxies.each do |k| -%>
-<%= k %>
-<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/206132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5303c5278fbc1609d3d9409e841de6c15652c34e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
