Pyoungmeister has uploaded a new change for review.
https://gerrit.wikimedia.org/r/57204
Change subject: need to include --defaults-file for init script to actually work
......................................................................
need to include --defaults-file for init script to actually work
Change-Id: I43c5cfdf6b270b94aed93b8c5c55b06e850c2296
---
M modules/mysql_multi_instance/manifests/instance.pp
M modules/mysql_multi_instance/templates/mysql.init.erb
2 files changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/57204/1
diff --git a/modules/mysql_multi_instance/manifests/instance.pp
b/modules/mysql_multi_instance/manifests/instance.pp
index 48b7be7..f445848 100644
--- a/modules/mysql_multi_instance/manifests/instance.pp
+++ b/modules/mysql_multi_instance/manifests/instance.pp
@@ -37,7 +37,6 @@
'read_only' => 1,
'user' => "mysql",
'socket' => "/tmp/mysql.${port}.sock",
- 'pidfile' => "/a/sqldata.${port}/mysql.pid",
'port' => $port,
'datadir' => "/a/sqldata.${port}/",
'tmpdir' => "/a/tmp/",
diff --git a/modules/mysql_multi_instance/templates/mysql.init.erb
b/modules/mysql_multi_instance/templates/mysql.init.erb
index 8aef417..1e5e3b2 100755
--- a/modules/mysql_multi_instance/templates/mysql.init.erb
+++ b/modules/mysql_multi_instance/templates/mysql.init.erb
@@ -44,7 +44,7 @@
# overwritten by settings in the MySQL configuration files.
basedir=/usr
-datadir=
+datadir=/a/sqldata.<%= port %>
# Default value, in seconds, afterwhich the script should timeout waiting
# for server start.
@@ -215,7 +215,7 @@
print_defaults="$bindir/mysql_print_defaults"
else
# Try to find basedir in /etc/my.cnf
- conf=/etc/my.cnf.<%= port %>
+ conf=/etc/mysql/my.cnf.<%= port %>
print_defaults=
if test -r $conf
then
@@ -327,7 +327,7 @@
# Give extra arguments to mysqld with the my.cnf file. This script
# may be overwritten at next upgrade.
pid_file=$server_pid_file
- $bindir/mysqld_safe --datadir=$datadir --pid-file=$server_pid_file
$other_args >/dev/null 2>&1 &
+ $bindir/mysqld_safe --defaults-file=/etc/mysql/my.cnf.<%= port %>
--datadir=$datadir --pid-file=$server_pid_file $other_args >/dev/null 2>&1 &
wait_for_pid created $!; return_value=$?
# Make lock for RedHat / SuSE
--
To view, visit https://gerrit.wikimedia.org/r/57204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43c5cfdf6b270b94aed93b8c5c55b06e850c2296
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
