Rush has submitted this change and it was merged.
Change subject: gallium: migrate cluster/contact to hiera
......................................................................
gallium: migrate cluster/contact to hiera
Move definition from the node 'gallium.wikimedia.org' to hiera.
Change-Id: I50b7fecc6e9e33ffcf17dd5b54e48072e215bf19
---
M hieradata/hosts/gallium.yaml
M manifests/site.pp
2 files changed, 2 insertions(+), 3 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/gallium.yaml b/hieradata/hosts/gallium.yaml
index 2d7eeb5..b3b343b 100644
--- a/hieradata/hosts/gallium.yaml
+++ b/hieradata/hosts/gallium.yaml
@@ -4,3 +4,5 @@
- contint-roots
ssh::server::disable_nist_kex: false
ssh::server::explicit_macs: false
+cluster: misc
+contactgroups: 'admins,contint'
diff --git a/manifests/site.pp b/manifests/site.pp
index 93926cb..cde7ff5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -997,9 +997,6 @@
node 'gallium.wikimedia.org' {
role ci::master, ci::slave, ci::website, zuul::production
- $cluster = 'misc'
- $nagios_contact_group = 'admins,contint'
-
# T51846, let us sync VisualEditor in mediawiki/extensions.git
sudo::user { 'jenkins-slave':
privileges => [
--
To view, visit https://gerrit.wikimedia.org/r/249441
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50b7fecc6e9e33ffcf17dd5b54e48072e215bf19
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Chasemp <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: John F. Lewis <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
