Ema has submitted this change and it was merged. Change subject: Add 'varnish_version' salt grain ......................................................................
Add 'varnish_version' salt grain Bug: T131499 Change-Id: Ib50ac2829ef0cbcb494d62a7ca84205c5fc2075b --- M modules/role/manifests/cache/2layer.pp 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: Ema: Verified; Looks good to me, approved Muehlenhoff: Looks good to me, but someone else must approve BBlack: Looks good to me, but someone else must approve diff --git a/modules/role/manifests/cache/2layer.pp b/modules/role/manifests/cache/2layer.pp index 32ee1a4..4724cb7 100644 --- a/modules/role/manifests/cache/2layer.pp +++ b/modules/role/manifests/cache/2layer.pp @@ -4,6 +4,22 @@ ) { include role::cache::base + $varnish_version4 = hiera('varnish_version4', false) + + if $varnish_version4 { + salt::grain { 'varnish_version': + ensure => present, + replace => true, + value => 4, + } + } else { + salt::grain { 'varnish_version': + ensure => present, + replace => true, + value => 3, + } + } + # Ganglia monitoring if $::standard::has_ganglia { class { 'varnish::monitoring::ganglia': @@ -41,7 +57,6 @@ varnish::setup_filesystem { $filesystems: } Varnish::Setup_filesystem <| |> -> Varnish::Instance <| |> - $varnish_version4 = hiera('varnish_version4', false) if ($varnish_version4) { # https://www.varnish-cache.org/docs/trunk/phk/persistent.html $persistent_name = 'deprecated_persistent' -- To view, visit https://gerrit.wikimedia.org/r/293296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib50ac2829ef0cbcb494d62a7ca84205c5fc2075b Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ema <e...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits