Skip to content

Commit d544a2e

Browse files
committed
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.
1 parent 702e09f commit d544a2e

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

manifests/setup/node_manager.pp

+12-2
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
node_group { 'PE Compiler Group A':
9393
ensure => 'present',
9494
parent => 'PE Compiler',
95-
data => { },
9695
rule => ['and',
9796
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
9897
['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'A'],
@@ -106,6 +105,12 @@
106105
'puppetdb_port' => [8081],
107106
}
108107
},
108+
data => {
109+
# Workaround for GH-118
110+
'puppet_enterprise::profile::master::puppetdb' => {
111+
'ha_enabled_replicas' => [ ],
112+
},
113+
},
109114
}
110115

111116
# Create the replica and B groups if a replica master and database host are
@@ -144,7 +149,6 @@
144149
node_group { 'PE Compiler Group B':
145150
ensure => 'present',
146151
parent => 'PE Compiler',
147-
data => { },
148152
rule => ['and',
149153
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
150154
['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'B'],
@@ -158,6 +162,12 @@
158162
'puppetdb_port' => [8081],
159163
}
160164
},
165+
data => {
166+
# Workaround for GH-118
167+
'puppet_enterprise::profile::master::puppetdb' => {
168+
'ha_enabled_replicas' => [ ],
169+
},
170+
},
161171
}
162172
}
163173

0 commit comments

Comments
 (0)