Skip to content

Commit f7d8500

Browse files
author
Benjamin Krein
committed
revert ini changes except environmentpath
1 parent d1a9646 commit f7d8500

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

manifests/master.pp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,6 @@
217217
ensure => $setting_config,
218218
setting => 'modulepath',
219219
value => $modulepath,
220-
section => 'main',
221220
}
222221
ini_setting {'puppetmastermanifest':
223222
ensure => $setting_config,
@@ -280,7 +279,6 @@
280279
ensure => present,
281280
setting => 'pluginsync',
282281
value => $pluginsync,
283-
section => 'agent',
284282
}
285283

286284
ini_setting {'puppetmasterparser':
@@ -307,7 +305,6 @@
307305
ensure => present,
308306
setting => 'digest_algorithm',
309307
value => $digest_algorithm,
310-
section => 'main',
311308
}
312309

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

spec/classes/puppet_master_spec.rb

Lines changed: 1 addition & 5 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 => 'main',
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 => 'agent',
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 => 'main',
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 => 'agent',
311307
:setting => 'pluginsync',
312308
:path => '/etc/puppet/puppet.conf',
313309
:value => 'true'
@@ -390,5 +386,5 @@
390386
)
391387
}
392388
end
393-
389+
394390
end

0 commit comments

Comments
 (0)