Skip to content

Commit 80f79c0

Browse files
author
mh
committed
no more masters - use the correct section
1 parent 566889c commit 80f79c0

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

manifests/master/report_processor.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
if $masterless {
1010
$puppet_conf_section = 'main'
1111
} else {
12-
$puppet_conf_section = 'master'
12+
$puppet_conf_section = 'server'
1313
}
1414

1515
$puppetdb_ensure = $enable ? {

manifests/master/storeconfigs.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
if $masterless {
1010
$puppet_conf_section = 'main'
1111
} else {
12-
$puppet_conf_section = 'master'
12+
$puppet_conf_section = 'server'
1313
}
1414

1515
$storeconfigs_ensure = $enable ? {

spec/unit/classes/master/report_processor_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
.with(
2525
'ensure' => 'absent',
2626
'path' => '/etc/puppet/puppet.conf',
27-
'section' => 'master',
27+
'section' => 'server',
2828
'setting' => 'reports',
2929
'subsetting' => 'puppetdb',
3030
'subsetting_separator' => ',',
@@ -44,7 +44,7 @@
4444
.with(
4545
'ensure' => 'present',
4646
'path' => '/etc/puppet/puppet.conf',
47-
'section' => 'master',
47+
'section' => 'server',
4848
'setting' => 'reports',
4949
'subsetting' => 'puppetdb',
5050
'subsetting_separator' => ',',

spec/unit/classes/master/storeconfigs_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
end
1313

1414
let(:param_ensure) { params[:enable] ? 'present' : 'absent' }
15-
let(:puppet_conf_section) { params[:masterless] ? 'main' : 'master' }
15+
let(:puppet_conf_section) { params[:masterless] ? 'main' : 'server' }
1616
let(:puppet_conf) { File.join(Puppet[:confdir], 'puppet.conf') }
1717

1818
context 'with default parameters' do

0 commit comments

Comments
 (0)