Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/89404
Change subject: Change role::labs-mysql-server to use the mysql module.
......................................................................
Change role::labs-mysql-server to use the mysql module.
Change-Id: I80e6da64b0c31a60ed68178682f55caac02b3ad7
---
M manifests/role/labsmysql.pp
1 file changed, 17 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/89404/1
diff --git a/manifests/role/labsmysql.pp b/manifests/role/labsmysql.pp
index 2f7be92..ea8075e 100644
--- a/manifests/role/labsmysql.pp
+++ b/manifests/role/labsmysql.pp
@@ -1,23 +1,21 @@
#include "mysql.db"
class role::labs-mysql-server {
- class { "generic::mysql::server":
- # Move mysql data to a place where there's actually space.
- datadir => $::mysql_datadir ? {
- undef => "/mnt/mysql",
- default => $::mysql_datadir,
- },
- innodb_file_per_table => $::mysql_file_per_table ? {
- undef => "1",
- default => $::mysql_file_per_table,
- },
- version => $::lsbdistrelease ? {
- "12.04" => "5.5",
- default => false,
- },
- bind_address => $mysql_server_bind_address ? {
- undef => "127.0.0.1",
- default => $mysql_server_bind_address
- },
- }
+
+ $datadir = $::mysql_datadir ? {
+ undef => '/mnt/mysql',
+ default => $::mysql_datadir,
+ }
+ $bind_address = $::mysql_server_bind_address ? {
+ undef => '127.0.0.1',
+ default => $::mysql_server_bind_address
+ }
+
+ class { 'mysql::server':
+ config_hash => {
+ # Move mysql data to a place where there's actually space.
+ 'datadir' => $role::labs-mysql-server::datadir,
+ 'bind_address' => $role::labs-mysql-server::bind_address,
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/89404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I80e6da64b0c31a60ed68178682f55caac02b3ad7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
