Skip to content

no more masters - use the correct section #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

no more masters - use the correct section #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifests/master/report_processor.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
if $masterless {
$puppet_conf_section = 'main'
} else {
$puppet_conf_section = 'master'
$puppet_conf_section = 'server'
}
Comment on lines 9 to 13
Copy link
Member

@bastelfreak bastelfreak Nov 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can make this a bit shorter:

  $puppet_conf_section = if $masterless {
    'main'
  } else {
   'server'
  }


$puppetdb_ensure = $enable ? {
Expand Down
2 changes: 1 addition & 1 deletion manifests/master/storeconfigs.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
if $masterless {
$puppet_conf_section = 'main'
} else {
$puppet_conf_section = 'master'
$puppet_conf_section = 'server'
Copy link
Member

@bastelfreak bastelfreak Nov 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

}

$storeconfigs_ensure = $enable ? {
Expand Down
4 changes: 2 additions & 2 deletions spec/unit/classes/master/report_processor_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
with(
'ensure' => 'absent',
'path' => '/etc/puppet/puppet.conf',
'section' => 'master',
'section' => 'server',
'setting' => 'reports',
'subsetting' => 'puppetdb',
'subsetting_separator' => ','
Expand All @@ -44,7 +44,7 @@
with(
'ensure' => 'present',
'path' => '/etc/puppet/puppet.conf',
'section' => 'master',
'section' => 'server',
'setting' => 'reports',
'subsetting' => 'puppetdb',
'subsetting_separator' => ','
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/classes/master/storeconfigs_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading