Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/383322 )
Change subject: profile::cache::base: explicitly declare varnish classes
......................................................................
profile::cache::base: explicitly declare varnish classes
These classes were imported into the manifest by a require inside
varnish::common::vcl, adding a good level of indirection and mistery to
what we were doing. Explicitly declare them in profile::cache::base as
our style guide suggests.
Change-Id: I371b5e4dc885bb8bd547660d8beb534413228085
---
M modules/profile/manifests/cache/base.pp
1 file changed, 12 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/383322/1
diff --git a/modules/profile/manifests/cache/base.pp
b/modules/profile/manifests/cache/base.pp
index c867b4c..428832e 100644
--- a/modules/profile/manifests/cache/base.pp
+++ b/modules/profile/manifests/cache/base.pp
@@ -13,6 +13,7 @@
$purge_host_only_upload_re =
hiera('profile::cache::base::purge_host_only_upload_re'),
$purge_host_not_upload_re =
hiera('profile::cache::base::purge_host_not_upload_re'),
$storage_parts = hiera('profile::cache::base::purge_host_not_upload_re'),
+ $packages_version = hiera('profile::cache::base::packages_version',
'installed')
) {
# There is no better way to do this, so it can't be a class parameter. In
fact,
# I consider our requirement to make hiera calls parameters
@@ -49,8 +50,18 @@
cache_cluster => $cache_cluster,
}
}
+ # Basic varnish classes
+ class { '::varnish::packages':
+ version => $packages_version,
+ }
- # Not ideal factorization to put this here, but works for now
+ class { [
+ '::varnish::common',
+ '::varnish::common::errorpage',
+ '::varnish::common::browsersec',
+ ]:
+ }
+
class { 'varnish::zero_update':
site => $zero_site,
}
--
To view, visit https://gerrit.wikimedia.org/r/383322
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I371b5e4dc885bb8bd547660d8beb534413228085
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
