opuppet/module-puppetlabs-mysql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changed defaults-file to defaults-extra-file

Browse source 
Should load the .my.cnf file with "--defaults-extra-file" instead of "--defaults-file". This is necessary if we have global my.cnf file but we want to use both of them.
This commit is contained in:
w32-blaster 2013-11-10 18:48:22 +01:00 committed by Tamas Szasz
parent 911dbe5c1a
commit e315ee96d0
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/puppet/provider/mysql.rb
View file

@ -8,7 +8,7 @@ class Puppet::Provider::Mysql < Puppet::Provider
# Optional defaults file
def self.defaults_file
if File.file?("#{Facter.value(:root_home)}/.my.cnf")
"--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
"--defaults-extra-file=#{Facter.value(:root_home)}/.my.cnf"
else
nil
end

2
lib/puppet/provider/mysql_database/mysql.rb
View file

@ -5,7 +5,7 @@ Puppet::Type.type(:mysql_database).provide(:mysql) do
def self.defaults_file
if File.file?("#{Facter.value(:root_home)}/.my.cnf")
"--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
"--defaults-extra-file=#{Facter.value(:root_home)}/.my.cnf"
else
nil
end

2
lib/puppet/provider/mysql_user/mysql.rb
View file

@ -7,7 +7,7 @@ Puppet::Type.type(:mysql_user).provide(:mysql, :parent => Puppet::Provider::Mysq
# Optional defaults file
def self.defaults_file
if File.file?("#{Facter.value(:root_home)}/.my.cnf")
"--defaults-file=#{Facter.value(:root_home)}/.my.cnf"
"--defaults-extra-file=#{Facter.value(:root_home)}/.my.cnf"
else
nil
end