Pyoungmeister has submitted this change and it was merged.
Change subject: some cleanup for multi_instance mysql
......................................................................
some cleanup for multi_instance mysql
Change-Id: I628f45907b2ee54edc2fd0e66ed7c54bd47a7ca4
---
M modules/mysql_multi_instance/manifests/init.pp
D modules/mysql_multi_instance/manifests/params.pp
A modules/mysql_multi_instance/templates/root.my.cnf.erb
3 files changed, 9 insertions(+), 156 deletions(-)
Approvals:
Pyoungmeister: Verified; Looks good to me, approved
diff --git a/modules/mysql_multi_instance/manifests/init.pp
b/modules/mysql_multi_instance/manifests/init.pp
index 75c79ed..d2a6bcc 100644
--- a/modules/mysql_multi_instance/manifests/init.pp
+++ b/modules/mysql_multi_instance/manifests/init.pp
@@ -40,5 +40,10 @@
'/etc/mysql/conf.d':
ensure => directory,
mode => '0755';
+ '/root/.my.cnf':
+ owner => root,
+ group => root,
+ mode => 0400,
+ content => template("mysql_multi_instance/root.my.cnf.erb");
}
}
diff --git a/modules/mysql_multi_instance/manifests/params.pp
b/modules/mysql_multi_instance/manifests/params.pp
deleted file mode 100644
index b34ac0b..0000000
--- a/modules/mysql_multi_instance/manifests/params.pp
+++ /dev/null
@@ -1,156 +0,0 @@
-# Class: mysql::params
-#
-# The mysql configuration settings.
-#
-# Parameters:
-#
-# Actions:
-#
-# Requires:
-#
-# Sample Usage:
-#
-class mysql_multi_instance::params {
-
- $bind_address = '127.0.0.1'
- $port = 3306
- $etc_root_password = false
- $ssl = false
- $restart = false
-
- case $::operatingsystem {
- 'Ubuntu': {
- $service_provider = upstart
- }
- default: {
- $service_provider = undef
- }
- }
-
- case $::osfamily {
- 'RedHat': {
- $basedir = '/usr'
- $datadir = '/var/lib/mysql'
- $service_name = 'mysqld'
- $client_package_name = 'mysql'
- $server_package_name = 'mysql-server'
- $socket = '/var/lib/mysql/mysql.sock'
- $pidfile = '/var/run/mysqld/mysqld.pid'
- $config_file = '/etc/my.cnf'
- $log_error = '/var/log/mysqld.log'
- $ruby_package_name = 'ruby-mysql'
- $ruby_package_provider = 'gem'
- $python_package_name = 'MySQL-python'
- $php_package_name = 'php-mysql'
- $java_package_name = 'mysql-connector-java'
- $root_group = 'root'
- $ssl_ca = '/etc/mysql/cacert.pem'
- $ssl_cert = '/etc/mysql/server-cert.pem'
- $ssl_key = '/etc/mysql/server-key.pem'
- }
-
- 'Suse': {
- $basedir = '/usr'
- $datadir = '/var/lib/mysql'
- $service_name = 'mysql'
- $client_package_name = $::operatingsystem ? {
- /OpenSuSE/ => 'mysql-community-server-client',
- /(SLES|SLED)/ => 'mysql-client',
- }
- $server_package_name = $::operatingsystem ? {
- /OpenSuSE/ => 'mysql-community-server',
- /(SLES|SLED)/ => 'mysql',
- }
- $socket = $::operatingsystem ? {
- /OpenSuSE/ => '/var/run/mysql/mysql.sock',
- /(SLES|SLED)/ => '/var/lib/mysql/mysql.sock',
- }
- $pidfile = '/var/run/mysql/mysqld.pid'
- $config_file = '/etc/my.cnf'
- $log_error = $::operatingsystem ? {
- /OpenSuSE/ => '/var/log/mysql/mysqld.log',
- /(SLES|SLED)/ => '/var/log/mysqld.log',
- }
- $ruby_package_name = $::operatingsystem ? {
- /OpenSuSE/ => 'rubygem-mysql',
- /(SLES|SLED)/ => 'ruby-mysql',
- }
- $python_package_name = 'python-mysql'
- $java_package_name = 'mysql-connector-java'
- $root_group = 'root'
- $ssl_ca = '/etc/mysql/cacert.pem'
- $ssl_cert = '/etc/mysql/server-cert.pem'
- $ssl_key = '/etc/mysql/server-key.pem'
- }
-
- 'Debian': {
- $basedir = '/usr'
- $datadir = '/a/sqldata/'
- $service_name = 'mysql'
- $client_package_name = 'mysql-client'
- $server_package_name = 'mysql-server'
- $socket = "/tmp/mysqld.sock"
- $pidfile = "/a/sqldata/${::hostname}.pid"
- $config_file = '/etc/mysql/my.cnf'
- $log_error = "/a/sqldata/${::hostname}.log"
- $ruby_package_name = 'libmysql-ruby'
- $python_package_name = 'python-mysqldb'
- $php_package_name = 'php5-mysql'
- $java_package_name = 'libmysql-java'
- $root_group = 'root'
- $ssl_ca = '/etc/mysql/cacert.pem'
- $ssl_cert = '/etc/mysql/server-cert.pem'
- $ssl_key = '/etc/mysql/server-key.pem'
- }
-
- 'FreeBSD': {
- $basedir = '/usr/local'
- $datadir = '/var/db/mysql'
- $service_name = 'mysql-server'
- $client_package_name = 'databases/mysql55-client'
- $server_package_name = 'databases/mysql55-server'
- $socket = '/tmp/mysql.sock'
- $pidfile = '/var/db/mysql/mysql.pid'
- $config_file = '/var/db/mysql/my.cnf'
- $log_error = "/var/db/mysql/${::hostname}.err"
- $ruby_package_name = 'ruby-mysql'
- $ruby_package_provider = 'gem'
- $python_package_name = 'databases/py-MySQLdb'
- $php_package_name = 'php5-mysql'
- $java_package_name = 'databases/mysql-connector-java'
- $root_group = 'wheel'
- $ssl_ca = undef
- $ssl_cert = undef
- $ssl_key = undef
- }
-
- default: {
- case $::operatingsystem {
- 'Amazon': {
- $basedir = '/usr'
- $datadir = '/var/lib/mysql'
- $service_name = 'mysqld'
- $client_package_name = 'mysql'
- $server_package_name = 'mysql-server'
- $socket = '/var/lib/mysql/mysql.sock'
- $config_file = '/etc/my.cnf'
- $log_error = '/var/log/mysqld.log'
- $ruby_package_name = 'ruby-mysql'
- $ruby_package_provider = 'gem'
- $python_package_name = 'MySQL-python'
- $php_package_name = 'php-mysql'
- $java_package_name = 'mysql-connector-java'
- $root_group = 'root'
- $ssl_ca = '/etc/mysql/cacert.pem'
- $ssl_cert = '/etc/mysql/server-cert.pem'
- $ssl_key = '/etc/mysql/server-key.pem'
- }
-
- default: {
- fail("Unsupported osfamily: ${::osfamily} operatingsystem:
${::operatingsystem}, module ${module_name} only support osfamily RedHat,
Debian, and FreeBSD, or operatingsystem Amazon")
- }
- }
- }
- }
-
-}
diff --git a/modules/mysql_multi_instance/templates/root.my.cnf.erb
b/modules/mysql_multi_instance/templates/root.my.cnf.erb
new file mode 100644
index 0000000..9dea78d
--- /dev/null
+++ b/modules/mysql_multi_instance/templates/root.my.cnf.erb
@@ -0,0 +1,4 @@
+[client]
+user=root
+password=<%= scope.lookupvar('passwords::misc::scripts::mysql_root_pass') %>
+socket=/tmp/mysql.sock
--
To view, visit https://gerrit.wikimedia.org/r/57755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I628f45907b2ee54edc2fd0e66ed7c54bd47a7ca4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister <[email protected]>
Gerrit-Reviewer: Pyoungmeister <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
