Merge pull request #751 from mcanevet/patch-1

Fix when not managing config file
puppetlabs · Sep 22, 2015 · c17c465 · c17c465
2 parents 8b36568 + 6228846
commit c17c465
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/manifests/server/installdb.pp b/manifests/server/installdb.pp
@@ -11,7 +11,8 @@
 
     if $mysql::server::manage_config_file {
       $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':

diff --git a/spec/classes/mysql_server_spec.rb b/spec/classes/mysql_server_spec.rb
@@ -19,6 +19,11 @@
           it { is_expected.to contain_class('mysql::server::account_security') }
         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
           it 'contains the package by default' do
             is_expected.to contain_package('mysql-server').with({