Gehel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/322927
Change subject: maps - maps-test* servers are test servers
......................................................................
maps - maps-test* servers are test servers
Ops should not be notified of issues on those servers, only the interactive
team is affected by issues there.
Bug: T149643
Change-Id: Iefe2613dd04b0a3ad580c6e7d0a8a8df51d1df0a
---
M hieradata/hosts/maps-test2001.yaml
M hieradata/hosts/maps-test2002.yaml
M hieradata/hosts/maps-test2003.yaml
M hieradata/hosts/maps-test2004.yaml
M modules/kartotherian/manifests/init.pp
M modules/tilerator/manifests/init.pp
M modules/tilerator/manifests/ui.pp
7 files changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/322927/1
diff --git a/hieradata/hosts/maps-test2001.yaml
b/hieradata/hosts/maps-test2001.yaml
index 21b1967..be82560 100644
--- a/hieradata/hosts/maps-test2001.yaml
+++ b/hieradata/hosts/maps-test2001.yaml
@@ -4,3 +4,6 @@
role::maps::master::planet_sync_hour: '*'
role::maps::master::postgres_tile_storage: true
tilerator::ui::storage_id: 'v5'
+
+# maps-test servers are just test servers, Ops don't need to be notified
+contact_groups: 'team-interactive'
diff --git a/hieradata/hosts/maps-test2002.yaml
b/hieradata/hosts/maps-test2002.yaml
index c5dc28a..68eb209 100644
--- a/hieradata/hosts/maps-test2002.yaml
+++ b/hieradata/hosts/maps-test2002.yaml
@@ -1,2 +1,5 @@
cassandra::rack: a5
do_paging: false
+
+# maps-test servers are just test servers, Ops don't need to be notified
+contact_groups: 'team-interactive'
diff --git a/hieradata/hosts/maps-test2003.yaml
b/hieradata/hosts/maps-test2003.yaml
index 419fb6d..72d7f0d 100644
--- a/hieradata/hosts/maps-test2003.yaml
+++ b/hieradata/hosts/maps-test2003.yaml
@@ -1,2 +1,5 @@
cassandra::rack: b5
do_paging: false
+
+# maps-test servers are just test servers, Ops don't need to be notified
+contact_groups: 'team-interactive'
diff --git a/hieradata/hosts/maps-test2004.yaml
b/hieradata/hosts/maps-test2004.yaml
index 419fb6d..72d7f0d 100644
--- a/hieradata/hosts/maps-test2004.yaml
+++ b/hieradata/hosts/maps-test2004.yaml
@@ -1,2 +1,5 @@
cassandra::rack: b5
do_paging: false
+
+# maps-test servers are just test servers, Ops don't need to be notified
+contact_groups: 'team-interactive'
diff --git a/modules/kartotherian/manifests/init.pp
b/modules/kartotherian/manifests/init.pp
index 63cfdd8..dd89150 100644
--- a/modules/kartotherian/manifests/init.pp
+++ b/modules/kartotherian/manifests/init.pp
@@ -25,7 +25,7 @@
#
class kartotherian(
$conf_sources = 'sources.prod.yaml',
- $contact_groups = 'admins',
+ $contact_groups = hiera('contactgroups', 'admins'),
$cassandra_servers = hiera('cassandra::seeds'),
) {
diff --git a/modules/tilerator/manifests/init.pp
b/modules/tilerator/manifests/init.pp
index 09a722d..3a250cf 100644
--- a/modules/tilerator/manifests/init.pp
+++ b/modules/tilerator/manifests/init.pp
@@ -25,7 +25,7 @@
#
class tilerator(
$conf_sources = 'sources.prod.yaml',
- $contact_groups = 'admins',
+ $contact_groups = hiera('contactgroups', 'admins'),
$cassandra_servers = hiera('cassandra::seeds'),
) {
diff --git a/modules/tilerator/manifests/ui.pp
b/modules/tilerator/manifests/ui.pp
index dbcbe48..ebce6e0 100644
--- a/modules/tilerator/manifests/ui.pp
+++ b/modules/tilerator/manifests/ui.pp
@@ -65,7 +65,7 @@
class tilerator::ui(
$port = 6535,
$conf_sources = 'sources.prod.yaml',
- $contact_groups = 'admins',
+ $contact_groups = hiera('contactgroups', 'admins'),
$statefile_dir = '/var/run/tileratorui',
$from_zoom = 10,
$before_zoom = 16,
--
To view, visit https://gerrit.wikimedia.org/r/322927
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefe2613dd04b0a3ad580c6e7d0a8a8df51d1df0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
