From d544a2e56726da73e9d204a5da5ada3a1f63cbce Mon Sep 17 00:00:00 2001 From: Reid Vandewiele Date: Thu, 10 Sep 2020 13:01:40 -0700 Subject: [PATCH] Add suggested workaround for GH-118 Set ha_enabled_replicas to an empty array for compilers only. We are already supplying the specific certnames that compilers' PuppetDB terminus configuration should use. --- manifests/setup/node_manager.pp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/manifests/setup/node_manager.pp b/manifests/setup/node_manager.pp index ca2ba767..789f8eb8 100644 --- a/manifests/setup/node_manager.pp +++ b/manifests/setup/node_manager.pp @@ -92,7 +92,6 @@ node_group { 'PE Compiler Group A': ensure => 'present', parent => 'PE Compiler', - data => { }, rule => ['and', ['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'], ['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'A'], @@ -106,6 +105,12 @@ 'puppetdb_port' => [8081], } }, + data => { + # Workaround for GH-118 + 'puppet_enterprise::profile::master::puppetdb' => { + 'ha_enabled_replicas' => [ ], + }, + }, } # Create the replica and B groups if a replica master and database host are @@ -144,7 +149,6 @@ node_group { 'PE Compiler Group B': ensure => 'present', parent => 'PE Compiler', - data => { }, rule => ['and', ['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'], ['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'B'], @@ -158,6 +162,12 @@ 'puppetdb_port' => [8081], } }, + data => { + # Workaround for GH-118 + 'puppet_enterprise::profile::master::puppetdb' => { + 'ha_enabled_replicas' => [ ], + }, + }, } }