BBlack has submitted this change and it was merged.
Change subject: no varnish::instance uses "backends" directly anymore
......................................................................
no varnish::instance uses "backends" directly anymore
Change-Id: I4759031c83b4b89efeb14a0feb5b70d5ea62e557
---
M modules/varnish/manifests/instance.pp
1 file changed, 2 insertions(+), 7 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/manifests/instance.pp
b/modules/varnish/manifests/instance.pp
index 74e0a8b..483e78c 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -7,7 +7,6 @@
$admin_port="6083",
$storage="-s malloc,1G",
$runtime_parameters=[],
- $backends=undef,
$directors={},
$extra_vcl = [],
$cluster_options={},
@@ -31,12 +30,8 @@
$varnish_port = $port
$varnish_admin_port = $admin_port
$varnish_storage = $storage
- if $backends {
- $varnish_backends = $backends
- } else {
- $backends_str = inline_template("<%= @directors.map{|k,v|
v['backends'] }.flatten.join('|') %>")
- $varnish_backends = sort(unique(split($backends_str, '\|')))
- }
+ $backends_str = inline_template("<%= @directors.map{|k,v| v['backends']
}.flatten.join('|') %>")
+ $varnish_backends = sort(unique(split($backends_str, '\|')))
$varnish_directors = $directors
$varnish_backend_options = $backend_options
--
To view, visit https://gerrit.wikimedia.org/r/230733
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4759031c83b4b89efeb14a0feb5b70d5ea62e557
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
