Pyoungmeister has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52942
Change subject: moving all stuff in the ::mysql namespace to ::mysql_wmf
......................................................................
moving all stuff in the ::mysql namespace to ::mysql_wmf
this is to import the honest to god puppet forge mysql module
Change-Id: Ieb2aad9789eb21ae8e333e58a97a7ae71ad0c311
---
M manifests/misc/bastion.pp
M manifests/misc/fundraising.pp
M manifests/mysql.pp
M manifests/role/coredb.pp
M manifests/role/db.pp
M manifests/role/fundraising.pp
M manifests/site.pp
7 files changed, 46 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/52942/1
diff --git a/manifests/misc/bastion.pp b/manifests/misc/bastion.pp
index 3ac9c7c..04a11bb 100644
--- a/manifests/misc/bastion.pp
+++ b/manifests/misc/bastion.pp
@@ -5,7 +5,7 @@
class misc::bastionhost {
system_role { "misc::bastionhost": description => "Bastion" }
- require mysql::client
+ require mysql_wmf::client
include sudo::appserver
diff --git a/manifests/misc/fundraising.pp b/manifests/misc/fundraising.pp
index a6a1812..3b3aa69 100644
--- a/manifests/misc/fundraising.pp
+++ b/manifests/misc/fundraising.pp
@@ -2,12 +2,12 @@
class misc::fundraising {
include passwords::civi,
- mysql::client::default-charset-binary
+ mysql_wmf::client::default_charset_binary
#what is currently on grosley/aluminium
system_role { 'misc::fundraising': description => 'fundraising sites
and operations' }
- require mysql::client
+ require mysql_wmf::client
package { [ 'libapache2-mod-php5', 'php5-cli', 'php-pear',
'php5-common', 'php5-curl', 'php5-dev', 'php5-gd', 'php5-mysql', 'php5-sqlite',
'subversion', 'phpunit', 'python-scipy', 'python-matplotlib', 'python-libxml2',
'python-sqlite', 'python-sqlitecachec', 'python-urlgrabber', 'python-argparse',
'python-dev', 'python-setuptools', 'python-mysqldb', 'libapache2-mod-python',
'r-base', 'r-cran-rmysql', 'python-rpy2' ]:
ensure => latest;
@@ -206,7 +206,7 @@
$weekday = '*',
) {
- file {
+ file {
'/usr/local/bin/dump_fundraisingdb':
owner => root,
group => root,
@@ -233,7 +233,7 @@
$weekday = '*',
) {
- file {
+ file {
'/usr/local/bin/offhost_backups':
owner => root,
group => root,
@@ -444,7 +444,7 @@
}
class misc::fundraising::udp2log_rotation {
-
+
include accounts::file_mover
sudo_user { "file_mover": privileges => ['ALL = NOPASSWD:
/usr/bin/killall -HUP udp2log'] }
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index dcd6c4d..80ae359 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -6,7 +6,7 @@
# top are meant for production wikimedia mysql installations.
# TODO should really be named mysql-server, or mysql::server
-class mysql {
+class mysql_wmf {
monitor_service { "mysql disk space": description => "MySQL disk
space", check_command => "nrpe_check_disk_6_3", critical => true }
#######################################################################
@@ -58,9 +58,9 @@
ensure => running,
hasstatus => false;
}
- include mysql::monitor::percona
+ include mysql_wmf::monitor::percona
if ($db_cluster =~ /^m1/) {
- include mysql::slow_digest
+ include mysql_wmf::slow_digest
}
}
}
@@ -237,9 +237,9 @@
}
}
- class monitor::percona inherits mysql {
+ class monitor::percona inherits mysql_wmf {
$crit = $master
- require "mysql::monitor::percona::files"
+ require "mysql_wmf::monitor::percona::files"
monitor_service { "mysqld": description => "mysqld processes",
check_command => "nrpe_check_mysqld", critical => $crit }
monitor_service { "mysql recent restart": description => "MySQL
Recent Restart", check_command => "nrpe_check_mysql_recent_restart", critical
=> $crit }
@@ -273,7 +273,7 @@
}
}
- class conf inherits mysql {
+ class conf inherits mysql_wmf {
$db_clusters = {
"fundraisingdb" => {
"innodb_log_file_size" => "500M"
@@ -338,7 +338,7 @@
}
}
- class pc::conf inherits mysql {
+ class pc::conf inherits mysql_wmf {
file { "/etc/my.cnf":
content => template("mysql/paresercache.my.cnf.erb")
}
@@ -356,8 +356,8 @@
}
}
- include mysql::ganglia,
- mysql::monitor::percona::files
+ include mysql_wmf::ganglia,
+ mysql_wmf::monitor::percona::files
# TODO do we want to have a class for PHP clients (php5-mysql) as well
# and rename this to mysql::client-cli?
@@ -387,7 +387,7 @@
content =>
template("mysql/send_query_digest.sh.erb");
}
- if $mysql::db_cluster {
+ if $mysql_wmf::db_cluster {
cron { slow_digest:
command => "/usr/local/bin/send_query_digest.sh
>/dev/null 2>&1",
require =>
File["/usr/local/bin/send_query_digest.sh"],
@@ -408,7 +408,7 @@
}
}
-class mysql::coredb::ganglia{
+class mysql_wmf::coredb::ganglia{
include passwords::ganglia
$ganglia_mysql_pass = $passwords::ganglia::ganglia_mysql_pass
@@ -438,7 +438,7 @@
}
}
-class mysql::coredb::monitoring( $crit = false, $no_slave = false ) {
+class mysql_wmf::coredb::monitoring( $crit = false, $no_slave = false ) {
include passwords::nagios::mysql
$mysql_check_pass = $passwords::nagios::mysql::mysql_check_pass
@@ -474,7 +474,7 @@
}
}
-class mysql::client::default-charset-binary {
+class mysql_wmf::client::default_charset_binary {
# ubuntu's stock mysql client defaults to latin1 charsets
# this overrides it to binary
file {
diff --git a/manifests/role/coredb.pp b/manifests/role/coredb.pp
index 3d4ddae..c73bade 100644
--- a/manifests/role/coredb.pp
+++ b/manifests/role/coredb.pp
@@ -268,7 +268,7 @@
system_role { "dbcore": description => "Shard ${shard} Core Database
server" }
include standard,
- mysql::coredb::ganglia,
+ mysql_wmf::coredb::ganglia,
mha::node
if $masters[$::site] == $::hostname
@@ -290,7 +290,7 @@
heartbeat_enabled => $heartbeat_enabled,
}
- class { "mysql::coredb::monitoring": crit => true }
+ class { "mysql_wmf::coredb::monitoring": crit => true }
}
else {
@@ -312,9 +312,9 @@
}
if $primary_site {
- class { "mysql::coredb::monitoring": crit => false }
+ class { "mysql_wmf::coredb::monitoring": crit => false }
} else {
- class { "mysql::coredb::monitoring": crit => false,
no_slave => true }
+ class { "mysql_wmf::coredb::monitoring": crit => false,
no_slave => true }
}
}
diff --git a/manifests/role/db.pp b/manifests/role/db.pp
index 63884b4..e4de5db 100644
--- a/manifests/role/db.pp
+++ b/manifests/role/db.pp
@@ -7,6 +7,6 @@
system_role { "db::core": description => "Core Database server" }
include standard,
- mysql
+ mysql_wmf
}
diff --git a/manifests/role/fundraising.pp b/manifests/role/fundraising.pp
index 3cd6a68..ac9bf4b 100644
--- a/manifests/role/fundraising.pp
+++ b/manifests/role/fundraising.pp
@@ -40,7 +40,7 @@
# variables used in fundraising exim template
$exim_signs_dkim = "true"
$exim_bounce_collector = "true"
-
+
$cluster = "fundraising"
$nagios_group = "${cluster}_${::site}"
@@ -94,11 +94,11 @@
system_role { "role::fundraising::database": description =>
"Fundraising Database (${mysql_role})" }
include standard,
- mysql,
- mysql::conf,
- mysql::datadirs,
- mysql::mysqluser,
- mysql::packages
+ mysql_wmf,
+ mysql_wmf::conf,
+ mysql_wmf::datadirs,
+ mysql_wmf::mysqluser,
+ mysql_wmf::packages
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 15c11fe..69b4bea 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -427,10 +427,10 @@
include role::db::core
if $hostname =~ /^(bellin|blondel)/ {
- include mysql::mysqluser,
- mysql::datadirs,
- mysql::conf,
- mysql::packages
+ include mysql_wmf::mysqluser,
+ mysql_wmf::datadirs,
+ mysql_wmf::conf,
+ mysql_wmf::packages
}
}
@@ -455,11 +455,11 @@
system_role { "role::admin_tools_sul_audit_db": description => "Admin
Tools/SUL Audit database" }
include base,
standard,
- mysql,
+ mysql_wmf,
#mysql::conf, doing this by hand b/c this is a weird short-term
use box
- mysql::datadirs,
- mysql::mysqluser,
- mysql::packages,
+ mysql_wmf::datadirs,
+ mysql_wmf::mysqluser,
+ mysql_wmf::packages,
ntp::client,
admins::roots,
accounts::pgehres
@@ -528,10 +528,10 @@
## eqiad fundraising DBs
node /^(db1008|db1025)\.eqiad\.wmnet/ {
- include mysql::mysqluser,
- mysql::datadirs,
- mysql::packages,
- mysql::conf
+ include mysql_wmf::mysqluser,
+ mysql_wmf::datadirs,
+ mysql_wmf::packages,
+ mysql_wmf::conf
if $hostname == "db1008" {
include role::fundraising::database::master
@@ -1906,10 +1906,10 @@
node /pc([1-3]\.pmtpa|100[1-3]\.eqiad)\.wmnet/ {
include role::db::core,
- mysql::mysqluser,
- mysql::datadirs,
- mysql::pc::conf,
- mysql::packages
+ mysql_wmf::mysqluser,
+ mysql_wmf::datadirs,
+ mysql_wmf::pc::conf,
+ mysql_wmf::packages
system_role { "mysql::pc::conf": description => "parser cache mysql server" }
}
--
To view, visit https://gerrit.wikimedia.org/r/52942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb2aad9789eb21ae8e333e58a97a7ae71ad0c311
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
