Skip to content
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

Jump to bottom

(PE-39429) Only restart puppetdb on non-legacy compilers #511

Merged
merged 4 commits into from
Oct 17, 2024
Merged

(PE-39429) Only restart puppetdb on non-legacy compilers #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dccf4bc
(PE-39429) Only restart puppetdb on non-legacy compilers
jhbuchanan45 Oct 7, 2024
bb0f87c
(PE-39429) Simplify targets for restarting compiler services
jhbuchanan45 Oct 14, 2024
528d200
(maint) Fix pdk lint error
jhbuchanan45 Oct 14, 2024
1ae13c4
(PE-39429) Use correct targets and only run if those targets are non-…
jhbuchanan45 Oct 14, 2024
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
10 changes: 8 additions & 2 deletions plans/convert.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,14 @@
# Restart cluster compiler services that are likely not restarted by our
# final Puppet run to increase chance everything is functional upon plan
# completion
run_command('systemctl restart pe-puppetserver.service pe-puppetdb.service',
$all_targets - $primary_target - $primary_postgresql_target - $replica_postgresql_target)
if $legacy_compiler_targets {
run_command('systemctl restart pe-puppetserver.service', $legacy_compiler_targets)
}

# PuppetDB is only found on modern compilers, not legacy ones
if $compiler_targets {
run_command('systemctl restart pe-puppetserver.service pe-puppetdb.service', $compiler_targets)
}

# Run puppet on all targets again to ensure everything is fully up-to-date
run_task('peadm::puppet_runonce', $all_targets)
Expand Down
2 changes: 1 addition & 1 deletion types/convertsteps.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#
# @summary type for the different steps where the peadm::convert plan can be started
#
type Peadm::ConvertSteps = Enum[ 'modify-primary-certs', 'modify-infra-certs', 'convert-node-groups', 'finalize']
type Peadm::ConvertSteps = Enum['modify-primary-certs', 'modify-infra-certs', 'convert-node-groups', 'finalize']
Loading