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

Merge pull request #751 from mcanevet/patch-1

Browse source 
Fix when not managing config file
This commit is contained in:
Igor Galić 2015-09-22 15:07:27 +02:00
commit c17c46552b
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
manifests/server/installdb.pp
View file

@ -11,7 +11,8 @@ class mysql::server::installdb {
if $mysql::server::manage_config_file { if $mysql::server::manage_config_file {
$install_db_args = "--basedir=${basedir} --defaults-extra-file=${config_file} --datadir=${datadir} --user=${mysqluser}" $install_db_args = "--basedir=${basedir} --defaults-extra-file=${config_file} --datadir=${datadir} --user=${mysqluser}"
} else {
$install_db_args = "--basedir=${basedir} --datadir=${datadir} --user=${mysqluser}"
} }
exec { 'mysql_install_db': exec { 'mysql_install_db':

5
spec/classes/mysql_server_spec.rb
View file

@ -19,6 +19,11 @@ describe 'mysql::server' do
it { is_expected.to contain_class('mysql::server::account_security') } it { is_expected.to contain_class('mysql::server::account_security') }
end end
context 'when not managing config file' do
let(:params) {{ :manage_config_file => false }}
it { is_expected.to compile.with_all_deps }
end
context 'mysql::server::install' do context 'mysql::server::install' do
it 'contains the package by default' do it 'contains the package by default' do
is_expected.to contain_package('mysql-server').with({ is_expected.to contain_package('mysql-server').with({