coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74158
Change subject: Add new labsudb role for Labs users' database
......................................................................
Add new labsudb role for Labs users' database
Intended to be a general-puropose mysql database for labs
projects' use; labsudb2 will be set up as a slave of
labsudb1 for redundancy purposes.
Change-Id: I89f889881460b33b69b6f27d2d2a3feeb973fdf1
---
M manifests/ganglia.pp
M manifests/role/db.pp
M manifests/site.pp
3 files changed, 37 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/74158/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index e7ec804..0978afd 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -155,9 +155,12 @@
"redis" => {
"name" => "Redis",
"ip_oct" => "39" },
- "labsnfs" => {
+ "labsnfs" => {
"name" => "Labs NFS cluster",
"ip_oct" => "40" },
+ "labsudb" => {
+ "name" => "Labs User database",
+ "ip_oct" => "41" },
}
# NOTE: Do *not* add new clusters *per site* anymore,
# the site name will automatically be appended now,
diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index f6060e2..b61c223 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -94,6 +94,30 @@
}
}
+class role::db::labsdb( $instances = {} ) {
+ $cluster = "labsudb"
+
+ system_role { "role::db::labsudb": description => "database for general
user from Labs users" }
+
+ include standard,
+ cpufrequtils
+
+ class { mysql:
+ package_name => 'mariadb-client-5.5'
+ }
+
+ # generic::mysql::server presumes mysql vs mariadb
+ # and pulls in stuff we do not want here.
+ class { mysql::server:
+ package_name => 'mariadb-server-5.5'
+ }
+
+ nrpe::monitor_service { "mysqld":
+ description => "mysqld processes",
+ nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1:1 -C mysqld"
+ }
+}
+
class role::labsdb::manager {
package { ["python-mysqldb", "python-yaml"]:
ensure => present;
diff --git a/manifests/site.pp b/manifests/site.pp
index 847bb2e..61b0d79 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1307,6 +1307,15 @@
}
}
+node 'labsudb1.pmtpa.wmnet' {
+ include role::db::labsudb
+}
+
+node 'labsudb2.pmtpa.wmnet' {
+ include standard
+ # will need Asher's help to set up as a slave the "WMF Way"
+}
+
node /labstore[12]\.pmtpa\.wmnet/ {
$cluster = "gluster"
--
To view, visit https://gerrit.wikimedia.org/r/74158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89f889881460b33b69b6f27d2d2a3feeb973fdf1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
