Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189868
Change subject: remove labsdb100[123] hacked role. use the mariadb config class.
......................................................................
remove labsdb100[123] hacked role. use the mariadb config class.
Change-Id: I478ad2a7cb8a4479207610ae95d4ac41fa674b78
---
M manifests/role/mariadb.pp
1 file changed, 11 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/189868/1
diff --git a/manifests/role/mariadb.pp b/manifests/role/mariadb.pp
index e27334c..3ad7855 100644
--- a/manifests/role/mariadb.pp
+++ b/manifests/role/mariadb.pp
@@ -378,9 +378,6 @@
}
# MariaDB 10 labsdb multiple-shards slave.
-# This role currently duplicates much of mariadb::config. This is necessary
-# while mysql_multi_instance is still applied to labsdb100[123], as there
-# are numerous clashes.
class role::mariadb::labs {
system::role { 'role::mariadb::labs':
@@ -389,36 +386,22 @@
include standard
include role::mariadb::grants
+ include passwords::misc::scripts
- $server_id = inline_template(
- "<%= ia = @ipaddress.split('.'); server_id = ia[0] + ia[2] + ia[3];
server_id %>"
- )
-
- file { '/etc/my.cnf':
- owner => 'root',
- group => 'root',
- mode => '0644',
- content => template('mariadb/labs.my.cnf.erb'),
+ class { 'mariadb::packages_wmf':
+ mariadb10 => true,
}
- file { '/etc/mysql/my.cnf':
- ensure => link,
- target => '/etc/my.cnf',
+ class { 'mariadb::config':
+ prompt => "LABS ${shard}",
+ config => 'mariadb/labs.my.cnf.erb',
+ password => $passwords::misc::scripts::mysql_root_pass,
+ datadir => '/srv/sqldata',
+ tmpdir => '/srv/tmp',
}
- file { '/srv/sqldata':
- ensure => directory,
- owner => 'mysql',
- group => 'mysql',
- mode => '0755',
- }
-
- file { '/srv/tmp':
- ensure => directory,
- owner => 'mysql',
- group => 'mysql',
- mode => '0755',
- }
+ include mariadb::monitor_disk
+ include mariadb::monitor_process
file { '/srv/innodb':
ensure => directory,
--
To view, visit https://gerrit.wikimedia.org/r/189868
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I478ad2a7cb8a4479207610ae95d4ac41fa674b78
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
