coren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/73171
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 should be set up as a slave of
labsudb1 for redundancy purposes.
Change-Id: I45a7f08642a4954ceb976638bd82be94e2942c53
---
M manifests/ganglia.pp
M manifests/role/db.pp
M manifests/site.pp
3 files changed, 48 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/73171/1
diff --git a/manifests/ganglia.pp b/manifests/ganglia.pp
index 11bcf55..88f10c3 100644
--- a/manifests/ganglia.pp
+++ b/manifests/ganglia.pp
@@ -157,6 +157,9 @@
"labsnfs" => {
"name" => "Labs NFS cluster",
"ip_oct" => "40" },
+ "labsudb" => {
+ "name" => "Labs user database cluster",
+ "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 c72575d..3d91bd1 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -93,6 +93,39 @@
}
}
+class role::db::labsudb {
+ $cluster = "labsudb"
+
+ system_role {"role::db::labsudb": description => "database for labs
users' use" }
+
+ include standard,
+ cpufrequtils,
+ mysql_multi_instance
+
+ class { mysql :
+ package_name => 'mariadb-client-5.5'
+ }
+
+ class { "generic::mysql::server":
+ datadir => "/a/mysql",
+ version => "5.5",
+ }
+
+ file { "/usr/lib/nagios/plugins/percona":
+ ensure => directory,
+ recurse => true,
+ owner => root,
+ group => root,
+ mode => 0555,
+ source => "puppet:///files/icinga/percona";
+ }
+
+ 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 01c4f94..8216d59 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1303,6 +1303,18 @@
}
}
+## labsudb dbs (user databases)
+node 'labsudb1.pmtpa.wmnet' {
+ include role::db::labsudb
+}
+
+node 'labsudb2.pmtpa.wmnet' {
+ include standard
+ # need Asher to explain how we setup slaves here. :-)
+}
+
+
+
node /labstore[12]\.pmtpa\.wmnet/ {
$cluster = "gluster"
--
To view, visit https://gerrit.wikimedia.org/r/73171
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45a7f08642a4954ceb976638bd82be94e2942c53
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
