diff --git a/manifests/server.pp b/manifests/server.pp index 9ac3b82d8..1a65886de 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -76,8 +76,8 @@ } Anchor['mysql::server::start'] - -> Class['mysql::server::config'] -> Class['mysql::server::install'] + -> Class['mysql::server::config'] -> Class['mysql::server::binarylog'] -> Class['mysql::server::installdb'] -> Class['mysql::server::service'] diff --git a/spec/acceptance/mysql_server_spec.rb b/spec/acceptance/mysql_server_spec.rb index d8e2f3e14..0e8754519 100644 --- a/spec/acceptance/mysql_server_spec.rb +++ b/spec/acceptance/mysql_server_spec.rb @@ -2,14 +2,9 @@ describe 'mysql class' do describe 'advanced config' do - before(:all) do - @tmpdir = default.tmpdir('mysql') - end let(:pp) do <<-EOS class { 'mysql::server': - config_file => '#{@tmpdir}/my.cnf', - includedir => '#{@tmpdir}/include', manage_config_file => 'true', override_options => { 'mysqld' => { 'key_buffer_size' => '32M' }}, package_ensure => 'present', @@ -58,8 +53,6 @@ class { 'mysql::server': let(:pp) do <<-EOS class { 'mysql::server': - config_file => '#{@tmpdir}/my.cnf', - includedir => '#{@tmpdir}/include', manage_config_file => 'false', override_options => { 'mysqld' => { 'key_buffer_size' => '32M' }}, package_ensure => 'present',