Skip to content

Commit 057340e

Browse files
stephenrjohnsonStephen
authored andcommitted
Fix issues with puppet 4.0 and the spec tests
1 parent ffddfff commit 057340e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

spec/classes/puppet_master_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@
7272
:notify => 'Service[httpd]'
7373
)
7474
should contain_class('puppet::storeconfigs').with(
75-
:before => 'Anchor[puppet::master::end]'
75+
:before => ['Anchor[puppet::master::end]']
7676
)
7777
should contain_class('puppet::passenger').with(
78-
:before => 'Anchor[puppet::master::end]'
78+
:before => ['Anchor[puppet::master::end]']
7979
)
8080
should contain_ini_setting('puppetmasterenvironmentpath').with(
8181
:ensure => 'absent',
@@ -240,10 +240,10 @@
240240
:notify => 'Service[httpd]'
241241
)
242242
should contain_class('puppet::storeconfigs').with(
243-
:before => 'Anchor[puppet::master::end]'
243+
:before => ['Anchor[puppet::master::end]']
244244
)
245245
should contain_class('puppet::passenger').with(
246-
:before => 'Anchor[puppet::master::end]'
246+
:before => ['Anchor[puppet::master::end]']
247247
)
248248
should contain_ini_setting('puppetmasterenvironmentpath').with(
249249
:ensure => 'absent'

spec/classes/puppet_passenger_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
:puppet_ssldir => '/var/lib/puppet/ssl',
1111
:certname => 'test.test.com',
1212
:conf_dir => '/etc/puppet',
13-
:dns_alt_names => ['puppet'],
13+
:dns_alt_names => 'puppet',
1414
}
1515
end
1616
context 'on Debian' do
@@ -30,7 +30,7 @@
3030
should contain_exec('Certificate_Check').with(
3131
:command =>
3232
"puppet cert clean #{params[:certname]} ; " +
33-
"puppet certificate --ca-location=local --dns_alt_names=#{params[:dns_alt_names].join(',')} generate #{params[:certname]}" +
33+
"puppet certificate --ca-location=local --dns_alt_names=#{params[:dns_alt_names]} generate #{params[:certname]}" +
3434
" && puppet cert sign --allow-dns-alt-names #{params[:certname]}" +
3535
" && puppet certificate --ca-location=local find #{params[:certname]}",
3636
:unless => "/bin/ls #{params[:puppet_ssldir]}/certs/#{params[:certname]}.pem",

0 commit comments

Comments
 (0)