Dzahn has submitted this change and it was merged.
Change subject: decom bellin and blondel and remove them from site.pp
......................................................................
decom bellin and blondel and remove them from site.pp
just keep db9 for now
Change-Id: Iee119821a6d5aa527a0d1a23b242d816fa270c6e
---
M manifests/decommissioning.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
RobH: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/decommissioning.pp b/manifests/decommissioning.pp
index 0bd0137..43305aa 100644
--- a/manifests/decommissioning.pp
+++ b/manifests/decommissioning.pp
@@ -7,6 +7,8 @@
'argon', # not really decom, just need to stop nagios monitoring
'barium',
'bayes',
+'bellin',
+'blondel',
'br1-knams',
'controller',
'cp3001',
diff --git a/manifests/site.pp b/manifests/site.pp
index ba42368..624e2df 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -479,17 +479,9 @@
include role::coredb::x1
}
-## m1 shard (still mostly not puppetized...)
-node /^(db(9)|blondel|bellin)\.pmtpa\.wmnet$/ {
- ## do not have most of our current puppet classe
+## m1 shard (used to be db9|blondel|bellin in the past)
+node "db9.pmtpa.wmnet" {
include role::db::core
-
- if $hostname =~ /^(bellin|blondel)/ {
- include mysql_wmf::mysqluser,
- mysql_wmf::datadirs,
- mysql_wmf::conf,
- mysql_wmf::packages
- }
}
## m1 shard (new)
--
To view, visit https://gerrit.wikimedia.org/r/63228
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iee119821a6d5aa527a0d1a23b242d816fa270c6e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: RobH <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
