BBlack has submitted this change and it was merged.
Change subject: Apply class-param + hiera pattern to base+2layer
......................................................................
Apply class-param + hiera pattern to base+2layer
Change-Id: I80a05815e6e1584b3fe423d3b9c113b677c6d140
---
A hieradata/common/role/cache/2layer.yaml
A hieradata/common/role/cache/base.yaml
A hieradata/eqiad/role/cache/base.yaml
M hieradata/labs.yaml
M modules/role/manifests/cache/2layer.pp
M modules/role/manifests/cache/base.pp
6 files changed, 27 insertions(+), 30 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/common/role/cache/2layer.yaml
b/hieradata/common/role/cache/2layer.yaml
new file mode 100644
index 0000000..06dd456
--- /dev/null
+++ b/hieradata/common/role/cache/2layer.yaml
@@ -0,0 +1,3 @@
+storage_parts:
+ - sda3
+ - sdb3
diff --git a/hieradata/common/role/cache/base.yaml
b/hieradata/common/role/cache/base.yaml
new file mode 100644
index 0000000..e5444d5
--- /dev/null
+++ b/hieradata/common/role/cache/base.yaml
@@ -0,0 +1,6 @@
+# These regexes are for optimization of PURGE traffic by having
+# non-upload sites ignore upload purges and having upload
+# ignore everything but upload purges via purge_host_regex
+# in child classes where warranted.
+purge_host_only_upload_re: '^upload\.wikimedia\.org$'
+purge_host_not_upload_re: '^(?!upload\.wikimedia\.org)'
diff --git a/hieradata/eqiad/role/cache/base.yaml
b/hieradata/eqiad/role/cache/base.yaml
new file mode 100644
index 0000000..3da4a0a
--- /dev/null
+++ b/hieradata/eqiad/role/cache/base.yaml
@@ -0,0 +1,2 @@
+cluster_tier: 'one'
+default_backend: 'backend'
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index a0157d3..ef178c6 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -24,3 +24,10 @@
cache::parsoid::nodes:
eqiad:
- '127.0.0.1'
+role::cache::base::cluster_tier: 'one'
+role::cache::base::default_backend: 'backend'
+role::cache::base::purge_host_only_upload_re: '^upload\.beta\.wmflabs\.org$'
+role::cache::base::purge_host_not_upload_re: '^(?!upload\.beta\.wmflabs\.org)'
+role::cache::2layer::storage_parts:
+ - vdb
+ - vdb
diff --git a/modules/role/manifests/cache/2layer.pp
b/modules/role/manifests/cache/2layer.pp
index be91652..a256e0a 100644
--- a/modules/role/manifests/cache/2layer.pp
+++ b/modules/role/manifests/cache/2layer.pp
@@ -1,5 +1,7 @@
# To be included by all concrete 2layer cache roles
-class role::cache::2layer {
+class role::cache::2layer(
+ $storage_parts = undef
+) {
include role::cache::base
# Ganglia monitoring
@@ -72,12 +74,6 @@
'0x580000000000',
'0x5C0000000000',
]
-
- # Everything else relies on length-two arrays here!
- $storage_parts = $::realm ? {
- production => [ 'sda3', 'sdb3' ],
- labs => [ 'vdb', 'vdb' ],
- }
$filesystems = unique($storage_parts)
varnish::setup_filesystem { $filesystems: }
diff --git a/modules/role/manifests/cache/base.pp
b/modules/role/manifests/cache/base.pp
index 9f8d16c..b300e8a 100644
--- a/modules/role/manifests/cache/base.pp
+++ b/modules/role/manifests/cache/base.pp
@@ -1,4 +1,9 @@
-class role::cache::base {
+class role::cache::base(
+ $cluster_tier = 'two',
+ $default_backend = $::mw_primary,
+ $purge_host_only_upload_re = '/./',
+ $purge_host_not_upload_re = '/./'
+) {
include lvs::configuration
include role::cache::configuration
include network::constants
@@ -8,27 +13,5 @@
include role::cache::perf
}
- # Any changes here will affect all descendent Varnish clusters
- # unless they're overridden!
- if $::site in ['eqiad'] {
- $cluster_tier = 'one'
- $default_backend = 'backend'
- } else {
- $cluster_tier = 'two'
- $default_backend = $::mw_primary
- }
$wikimedia_networks = flatten([$network::constants::all_networks,
'127.0.0.0/8', '::1/128'])
-
- # These regexes are for optimization of PURGE traffic by having
- # non-upload sites ignore upload purges and having upload
- # ignore everything but upload purges via purge_host_regex
- # in child classes where warranted.
- $purge_host_only_upload_re = $::realm ? {
- 'production' => '^upload\.wikimedia\.org$',
- 'labs' => '^upload\.beta\.wmflabs\.org$',
- }
- $purge_host_not_upload_re = $::realm ? {
- 'production' => '^(?!upload\.wikimedia\.org)',
- 'labs' => '^(?!upload\.beta\.wmflabs\.org)',
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/204545
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80a05815e6e1584b3fe423d3b9c113b677c6d140
Gerrit-PatchSet: 19
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
