Skip to content

Commit 504e30e

Browse files
Merge pull request #71 from benjamink/ini-section-fixes
fix sections settings for various configuration params
2 parents bfe3de4 + f7d8500 commit 504e30e

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

manifests/master.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@
227227
ensure => $setting_directory,
228228
setting => 'environmentpath',
229229
value => $environmentpath,
230+
section => 'main',
230231
}
231232

232233
if $external_nodes != undef {

spec/classes/puppet_master_spec.rb

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@
8282
)
8383
should contain_ini_setting('puppetmastermodulepath').with(
8484
:ensure => 'present',
85-
:section => 'master',
8685
:setting => 'modulepath',
8786
:path => '/etc/puppet/puppet.conf',
8887
:value => params[:modulepath],
@@ -146,7 +145,6 @@
146145
)
147146
should contain_ini_setting('puppetmasterpluginsync').with(
148147
:ensure => 'present',
149-
:section => 'master',
150148
:setting => 'pluginsync',
151149
:path => '/etc/puppet/puppet.conf',
152150
:value => 'true'
@@ -243,7 +241,6 @@
243241
)
244242
should contain_ini_setting('puppetmastermodulepath').with(
245243
:ensure => 'present',
246-
:section => 'master',
247244
:setting => 'modulepath',
248245
:path => '/etc/puppet/puppet.conf',
249246
:value => params[:modulepath],
@@ -307,7 +304,6 @@
307304
)
308305
should contain_ini_setting('puppetmasterpluginsync').with(
309306
:ensure => 'present',
310-
:section => 'master',
311307
:setting => 'pluginsync',
312308
:path => '/etc/puppet/puppet.conf',
313309
:value => 'true'
@@ -342,7 +338,7 @@
342338
it {
343339
should contain_ini_setting('puppetmasterenvironmentpath').with(
344340
:ensure => 'present',
345-
:section => 'master',
341+
:section => 'main',
346342
:setting => 'environmentpath',
347343
:path => '/etc/puppet/puppet.conf',
348344
:value => '$confdir/environments'
@@ -375,7 +371,7 @@
375371
it {
376372
should contain_ini_setting('puppetmasterenvironmentpath').with(
377373
:ensure => 'present',
378-
:section => 'master',
374+
:section => 'main',
379375
:setting => 'environmentpath',
380376
:path => '/etc/puppet/puppet.conf',
381377
:value => '/etc/puppetlabs/puppet/environments'
@@ -390,5 +386,5 @@
390386
)
391387
}
392388
end
393-
389+
394390
end

0 commit comments

Comments
 (0)