From 81f130a1fa3da4ded40d78912df19d0ab3562d1d Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 25 Jul 2025 09:32:19 +0000 Subject: [PATCH] no more masters - use the correct section --- manifests/master/report_processor.pp | 2 +- manifests/master/storeconfigs.pp | 2 +- spec/unit/classes/master/report_processor_spec.rb | 4 ++-- spec/unit/classes/master/storeconfigs_spec.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/master/report_processor.pp b/manifests/master/report_processor.pp index c715c10..41312b7 100644 --- a/manifests/master/report_processor.pp +++ b/manifests/master/report_processor.pp @@ -9,7 +9,7 @@ if $masterless { $puppet_conf_section = 'main' } else { - $puppet_conf_section = 'master' + $puppet_conf_section = 'server' } $puppetdb_ensure = $enable ? { diff --git a/manifests/master/storeconfigs.pp b/manifests/master/storeconfigs.pp index b22f24b..effa0ba 100644 --- a/manifests/master/storeconfigs.pp +++ b/manifests/master/storeconfigs.pp @@ -9,7 +9,7 @@ if $masterless { $puppet_conf_section = 'main' } else { - $puppet_conf_section = 'master' + $puppet_conf_section = 'server' } $storeconfigs_ensure = $enable ? { diff --git a/spec/unit/classes/master/report_processor_spec.rb b/spec/unit/classes/master/report_processor_spec.rb index 22fbcd8..4846670 100644 --- a/spec/unit/classes/master/report_processor_spec.rb +++ b/spec/unit/classes/master/report_processor_spec.rb @@ -24,7 +24,7 @@ with( 'ensure' => 'absent', 'path' => '/etc/puppet/puppet.conf', - 'section' => 'master', + 'section' => 'server', 'setting' => 'reports', 'subsetting' => 'puppetdb', 'subsetting_separator' => ',' @@ -44,7 +44,7 @@ with( 'ensure' => 'present', 'path' => '/etc/puppet/puppet.conf', - 'section' => 'master', + 'section' => 'server', 'setting' => 'reports', 'subsetting' => 'puppetdb', 'subsetting_separator' => ',' diff --git a/spec/unit/classes/master/storeconfigs_spec.rb b/spec/unit/classes/master/storeconfigs_spec.rb index c688803..daf68c8 100644 --- a/spec/unit/classes/master/storeconfigs_spec.rb +++ b/spec/unit/classes/master/storeconfigs_spec.rb @@ -12,7 +12,7 @@ end let(:param_ensure) { params[:enable] ? 'present' : 'absent' } - let(:puppet_conf_section) { params[:masterless] ? 'main' : 'master' } + let(:puppet_conf_section) { params[:masterless] ? 'main' : 'server' } let(:puppet_conf) { File.join(Puppet[:confdir], 'puppet.conf') } context 'with default parameters' do