BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/385413 )
Change subject: htcppurger: move puppetization to base profile + hieradata
......................................................................
htcppurger: move puppetization to base profile + hieradata
Change-Id: I9b4d1e7cac54acded0d51eaedc5b772467e1ea25
---
M hieradata/role/common/cache/misc.yaml
M hieradata/role/common/cache/text.yaml
M hieradata/role/common/cache/upload.yaml
M modules/profile/manifests/cache/base.pp
M modules/profile/manifests/cache/misc.pp
M modules/profile/manifests/cache/text.pp
M modules/profile/manifests/cache/upload.pp
M modules/varnish/manifests/htcppurger.pp
8 files changed, 23 insertions(+), 15 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
Dzahn: Looks good to me, but someone else must approve
diff --git a/hieradata/role/common/cache/misc.yaml
b/hieradata/role/common/cache/misc.yaml
index c596edd..f819499 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -279,6 +279,9 @@
profile::cache::base::purge_host_only_upload_re:
'^(upload|maps)\.wikimedia\.org$'
profile::cache::base::purge_host_not_upload_re:
'^(?!(upload|maps)\.wikimedia\.org)'
profile::cache::base::storage_parts: ['sda3', 'sdb3']
+profile::cache::base::purge_host_regex: ''
+profile::cache::base::purge_multicasts: ['239.128.0.115']
+profile::cache::base::purge_varnishes: ['127.0.0.1:3128', '127.0.0.1:3127']
# Profile::cache::ssl::unified
profile::cache::ssl::unified::monitoring: true
profile::cache::ssl::unified::letsencrypt: false
diff --git a/hieradata/role/common/cache/text.yaml
b/hieradata/role/common/cache/text.yaml
index 8a8d6ba..6c3c798 100644
--- a/hieradata/role/common/cache/text.yaml
+++ b/hieradata/role/common/cache/text.yaml
@@ -83,6 +83,9 @@
profile::cache::base::purge_host_only_upload_re:
'^(upload|maps)\.wikimedia\.org$'
profile::cache::base::purge_host_not_upload_re:
'^(?!(upload|maps)\.wikimedia\.org)'
profile::cache::base::storage_parts: ['sda3', 'sdb3']
+profile::cache::base::purge_host_regex: ''
+profile::cache::base::purge_multicasts: ['239.128.0.112']
+profile::cache::base::purge_varnishes: ['127.0.0.1:3128', '127.0.0.1:3127']
# Profile::cache::ssl::unified
profile::cache::ssl::unified::monitoring: true
profile::cache::ssl::unified::letsencrypt: false
diff --git a/hieradata/role/common/cache/upload.yaml
b/hieradata/role/common/cache/upload.yaml
index 4fa61ae..1e25a91 100644
--- a/hieradata/role/common/cache/upload.yaml
+++ b/hieradata/role/common/cache/upload.yaml
@@ -55,6 +55,9 @@
profile::cache::base::purge_host_only_upload_re:
'^(upload|maps)\.wikimedia\.org$'
profile::cache::base::purge_host_not_upload_re:
'^(?!(upload|maps)\.wikimedia\.org)'
profile::cache::base::storage_parts: ['sda3', 'sdb3']
+profile::cache::base::purge_host_regex: '[um][pa][lp][os]'
+profile::cache::base::purge_multicasts: ['239.128.0.112', '239.128.0.113',
'239.128.0.114']
+profile::cache::base::purge_varnishes: ['127.0.0.1:3128', '127.0.0.1:3127']
# Profile::cache::ssl::unified
profile::cache::ssl::unified::monitoring: true
profile::cache::ssl::unified::letsencrypt: false
diff --git a/modules/profile/manifests/cache/base.pp
b/modules/profile/manifests/cache/base.pp
index 447e69a..77bd19d 100644
--- a/modules/profile/manifests/cache/base.pp
+++ b/modules/profile/manifests/cache/base.pp
@@ -15,6 +15,9 @@
$storage_parts = hiera('profile::cache::base::purge_host_not_upload_re'),
$packages_version = hiera('profile::cache::base::packages_version',
'installed'),
$varnish_version = hiera('profile::cache::base::varnish_version', 4),
+ $purge_host_regex = hiera('profile::cache::base::purge_host_regex', ''),
+ $purge_multicasts = hiera('profile::cache::base::purge_multicasts',
['239.128.0.112']),
+ $purge_varnishes = hiera('profile::cache::base::purge_varnishes',
['127.0.0.1:3128', '127.0.0.1:3127']),
) {
# 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
@@ -106,4 +109,13 @@
"-s
main1=file,/srv/${storage_parts[0]}/varnish.main1,${storage_size}G",
"-s
main2=file,/srv/${storage_parts[1]}/varnish.main2,${storage_size}G",
], ' ')
+
+ ###########################################################################
+ # Purging
+ ###########################################################################
+ class { 'varnish::htcppurger':
+ host_regex => $purge_host_regex,
+ mc_addrs => $purge_multicasts,
+ varnishes => $purge_varnishes,
+ }
}
diff --git a/modules/profile/manifests/cache/misc.pp
b/modules/profile/manifests/cache/misc.pp
index f5bfbd1..000be44 100644
--- a/modules/profile/manifests/cache/misc.pp
+++ b/modules/profile/manifests/cache/misc.pp
@@ -15,10 +15,6 @@
class { 'tlsproxy::prometheus': }
class { 'prometheus::node_vhtcpd': }
- class { 'varnish::htcppurger':
- mc_addrs => [ '239.128.0.115' ],
- }
-
class { '::lvs::realserver':
realserver_ips =>
$lvs::configuration::service_ips['misc_web'][$::site],
}
diff --git a/modules/profile/manifests/cache/text.pp
b/modules/profile/manifests/cache/text.pp
index 0e79b33..a052c01 100644
--- a/modules/profile/manifests/cache/text.pp
+++ b/modules/profile/manifests/cache/text.pp
@@ -29,10 +29,6 @@
class { 'tlsproxy::prometheus': }
class { 'prometheus::node_vhtcpd': }
- class { 'varnish::htcppurger':
- mc_addrs => [ '239.128.0.112' ],
- }
-
$fe_cache_be_opts = {
'port' => 3128,
'connect_timeout' => '5s',
diff --git a/modules/profile/manifests/cache/upload.pp
b/modules/profile/manifests/cache/upload.pp
index ea3978a..ccf7df9 100644
--- a/modules/profile/manifests/cache/upload.pp
+++ b/modules/profile/manifests/cache/upload.pp
@@ -15,11 +15,6 @@
class { 'tlsproxy::prometheus': }
class { 'prometheus::node_vhtcpd': }
- class { 'varnish::htcppurger':
- host_regex => '[um][pa][lp][os]', # like 'uplo|maps', but avoiding
shell metachar...
- mc_addrs => [ '239.128.0.112', '239.128.0.113', '239.128.0.114' ],
- }
-
class { '::lvs::realserver':
realserver_ips => $lvs::configuration::service_ips['upload'][$::site],
}
diff --git a/modules/varnish/manifests/htcppurger.pp
b/modules/varnish/manifests/htcppurger.pp
index e5a7729..62ae187 100644
--- a/modules/varnish/manifests/htcppurger.pp
+++ b/modules/varnish/manifests/htcppurger.pp
@@ -31,8 +31,8 @@
class varnish::htcppurger(
$mc_addrs,
- $host_regex = '',
- $varnishes = [ '127.0.0.1:3128', '127.0.0.1:3127' ],
+ $host_regex,
+ $varnishes,
) {
Class[varnish::packages] -> Class[varnish::htcppurger]
--
To view, visit https://gerrit.wikimedia.org/r/385413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b4d1e7cac54acded0d51eaedc5b772467e1ea25
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
