Skip to content

Node manager fix #60

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

Merged
merged 2 commits into from
Feb 20, 2020
Merged

Node manager fix #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d6361c
Updates to allow replicas without puppetdb
bwilcox Feb 13, 2020
3893d6a
removed commented line
bwilcox Feb 14, 2020
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
8 changes: 3 additions & 5 deletions manifests/setup/node_manager.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
Optional[String[1]] $puppetdb_database_replica_host = undef,
) {

if ([$master_replica_host, $puppetdb_database_replica_host].filter |$_| { $_ }.size == 1) {
fail('Must pass both master_replica_host and puppetdb_database_replica_host, or neither')
}

##################################################
# PE INFRASTRUCTURE GROUPS
##################################################
Expand Down Expand Up @@ -120,7 +116,7 @@

# Create the replica and B groups if a replica master and database host are
# supplied
if ($master_replica_host and $puppetdb_database_replica_host) {
if $master_replica_host {
# We need to pre-create this group so that the master replica can be
# identified as running PuppetDB, so that Puppet will create a pg_ident
# authorization rule for it on the PostgreSQL nodes.
Expand All @@ -133,7 +129,9 @@
},
variables => { 'peadm_replica' => true },
}
}

if $puppetdb_database_replica_host {
node_group { 'PE Master B':
ensure => present,
parent => 'PE Infrastructure',
Expand Down