Skip to content

Commit d1a9646

Browse files
author
Benjamin Krein
committed
fix sections settings for various configuration params
1 parent 0c15ebc commit d1a9646

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

manifests/master.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@
217217
ensure => $setting_config,
218218
setting => 'modulepath',
219219
value => $modulepath,
220+
section => 'main',
220221
}
221222
ini_setting {'puppetmastermanifest':
222223
ensure => $setting_config,
@@ -227,6 +228,7 @@
227228
ensure => $setting_directory,
228229
setting => 'environmentpath',
229230
value => $environmentpath,
231+
section => 'main',
230232
}
231233

232234
if $external_nodes != undef {
@@ -278,6 +280,7 @@
278280
ensure => present,
279281
setting => 'pluginsync',
280282
value => $pluginsync,
283+
section => 'agent',
281284
}
282285

283286
ini_setting {'puppetmasterparser':
@@ -304,6 +307,7 @@
304307
ensure => present,
305308
setting => 'digest_algorithm',
306309
value => $digest_algorithm,
310+
section => 'main',
307311
}
308312

309313
anchor { 'puppet::master::end': }

spec/classes/puppet_master_spec.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
)
8383
should contain_ini_setting('puppetmastermodulepath').with(
8484
:ensure => 'present',
85-
:section => 'master',
85+
:section => 'main',
8686
:setting => 'modulepath',
8787
:path => '/etc/puppet/puppet.conf',
8888
:value => params[:modulepath],
@@ -146,7 +146,7 @@
146146
)
147147
should contain_ini_setting('puppetmasterpluginsync').with(
148148
:ensure => 'present',
149-
:section => 'master',
149+
:section => 'agent',
150150
:setting => 'pluginsync',
151151
:path => '/etc/puppet/puppet.conf',
152152
:value => 'true'
@@ -243,7 +243,7 @@
243243
)
244244
should contain_ini_setting('puppetmastermodulepath').with(
245245
:ensure => 'present',
246-
:section => 'master',
246+
:section => 'main',
247247
:setting => 'modulepath',
248248
:path => '/etc/puppet/puppet.conf',
249249
:value => params[:modulepath],
@@ -307,7 +307,7 @@
307307
)
308308
should contain_ini_setting('puppetmasterpluginsync').with(
309309
:ensure => 'present',
310-
:section => 'master',
310+
:section => 'agent',
311311
:setting => 'pluginsync',
312312
:path => '/etc/puppet/puppet.conf',
313313
:value => 'true'
@@ -342,7 +342,7 @@
342342
it {
343343
should contain_ini_setting('puppetmasterenvironmentpath').with(
344344
:ensure => 'present',
345-
:section => 'master',
345+
:section => 'main',
346346
:setting => 'environmentpath',
347347
:path => '/etc/puppet/puppet.conf',
348348
:value => '$confdir/environments'
@@ -375,7 +375,7 @@
375375
it {
376376
should contain_ini_setting('puppetmasterenvironmentpath').with(
377377
:ensure => 'present',
378-
:section => 'master',
378+
:section => 'main',
379379
:setting => 'environmentpath',
380380
:path => '/etc/puppet/puppet.conf',
381381
:value => '/etc/puppetlabs/puppet/environments'

0 commit comments

Comments
 (0)