Skip to content

Commit 7a77084

Browse files
authored
Merge pull request #987 from joshuaspence/ordering
Ensure that Puppet runs are idempotent
2 parents 7db2865 + d13c06b commit 7a77084

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

manifests/server.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
}
7777

7878
Anchor['mysql::server::start']
79-
-> Class['mysql::server::config']
8079
-> Class['mysql::server::install']
80+
-> Class['mysql::server::config']
8181
-> Class['mysql::server::binarylog']
8282
-> Class['mysql::server::installdb']
8383
-> Class['mysql::server::service']

spec/acceptance/mysql_server_spec.rb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,9 @@
33
describe 'mysql class' do
44
# rubocop:disable RSpec/InstanceVariable
55
describe 'advanced config' do
6-
before(:all) do
7-
@tmpdir = default.tmpdir('mysql')
8-
end
96
let(:pp) do
107
<<-MANIFEST
118
class { 'mysql::server':
12-
config_file => '#{@tmpdir}/my.cnf',
13-
includedir => '#{@tmpdir}/include',
149
manage_config_file => 'true',
1510
override_options => { 'mysqld' => { 'key_buffer_size' => '32M' }},
1611
package_ensure => 'present',
@@ -59,8 +54,6 @@ class { 'mysql::server':
5954
let(:pp) do
6055
<<-MANIFEST
6156
class { 'mysql::server':
62-
config_file => '#{@tmpdir}/my.cnf',
63-
includedir => '#{@tmpdir}/include',
6457
manage_config_file => 'false',
6558
override_options => { 'mysqld' => { 'key_buffer_size' => '32M' }},
6659
package_ensure => 'present',

0 commit comments

Comments
 (0)