Pyoungmeister has submitted this change and it was merged.
Change subject: moving mysql nagios group resources to coredb.pp
......................................................................
moving mysql nagios group resources to coredb.pp
Change-Id: Ifec8aff51a9f26eccb6f5181d7243223e08c29cb
---
M manifests/role/coredb.pp
M manifests/role/db.pp
2 files changed, 8 insertions(+), 7 deletions(-)
Approvals:
Pyoungmeister: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 72b6175..c92707e 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -1,3 +1,11 @@
+# Virtual resource for the monitoring server
+@monitor_group { "es_pmtpa": description => "pmtpa External Storage" }
+@monitor_group { "es_eqiad": description => "eqiad External Storage" }
+@monitor_group { "mysql_pmtpa": description => "pmtpa mysql core" }
+@monitor_group { "mysql_eqiad": description => "eqiad mysql core" }
+
+## for describing replication topology
+## hosts must be added here in addition to site.pp
class role::coredb::config {
$topology = {
's1' => {
diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index 678dd71..3715d16 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -1,13 +1,6 @@
# role/db.pp
# db::core and db::es
-# Virtual resource for the monitoring server
-@monitor_group { "es_pmtpa": description => "pmtpa External Storage" }
-@monitor_group { "es_eqiad": description => "eqiad External Storage" }
-@monitor_group { "mysql_pmtpa": description => "pmtpa mysql core" }
-@monitor_group { "mysql_eqiad": description => "eqiad mysql core" }
-
-
class role::db::core {
$cluster = "mysql"
--
To view, visit https://gerrit.wikimedia.org/r/51056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifec8aff51a9f26eccb6f5181d7243223e08c29cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
Gerrit-Reviewer: Pyoungmeister <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
