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

Use node_manager's new purge_behavior parameter #134

Merged
merged 1 commit into from
Jan 28, 2021
Merged

Use node_manager's new purge_behavior parameter #134

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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
### Improvements

- Handle exit code 11 from replica upgrade task gracefully. Code 11 means "PuppetDB sync in progress but not yet complete".
- Further remediate the bug fixed in 2.4.2, by ensuring that all peadm-managed node groups preserve existing data or class parameters not explicitly being managed. This is accomplished by requiring a new version of WhatsARanjit-node\_manager, v0.7.4.

## 2.4.5
### Summary
Expand Down
61 changes: 0 additions & 61 deletions lib/puppet/functions/peadm/merge_ng_config_data.rb
View file
Open in desktop

This file was deleted.

11 changes: 8 additions & 3 deletions manifests/setup/node_manager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@
Optional[String[1]] $puppetdb_database_replica_host = $master_replica_host,
) {

# Preserve existing user data and classes values. We only need to make sure
# the values we care about are present; we don't need to remove anything
# else.
Node_group {
purge_behavior => none,
}

##################################################
# PE INFRASTRUCTURE GROUPS
##################################################
Expand All @@ -62,9 +69,7 @@
# out-of-box configuration of the group.
$compiler_pool_address_data = $compiler_pool_address ? {
undef => undef,
default => Deferred('peadm::merge_ng_config_data', ['PE Master',
{ 'pe_repo' => { 'compile_master_pool_address' => $compiler_pool_address } }
]),
default => { 'pe_repo' => { 'compile_master_pool_address' => $compiler_pool_address } },
}

node_group { 'PE Master':
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
{
"name": "WhatsARanjit/node_manager",
"version_requirement": ">= 0.7.3 < 2.0.0"
"version_requirement": ">= 0.7.4 < 2.0.0"
},
{
"name": "puppetlabs/bolt_shim",
Expand Down