Skip to content

Commit 6472fed

Browse files
committed
fix(setup): update puppetdb_host to use internal compiler pool addresses
- Replaced `${trusted['certname']}` with `$internal_compiler_a_pool_address` and `$internal_compiler_b_pool_address` in `puppetdb_host` for `puppet_enterprise::profile::master` class. - Applied `.filter |$_| { $_ }` to ensure non-empty values. - Removed lint ignore comments for single quote string with variables. This change ensures that the correct internal compiler pool addresses are used for the `puppetdb_host` configuration.
1 parent 14a5900 commit 6472fed

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

manifests/setup/legacy_compiler_group.pp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@
1616
],
1717
classes => {
1818
'puppet_enterprise::profile::master' => {
19-
# lint:ignore:single_quote_string_with_variables
20-
'puppetdb_host' => ['${trusted[\'certname\']}'],
21-
# lint:endignore
19+
'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
2220
'puppetdb_port' => [8081],
2321
},
2422
},
@@ -34,9 +32,7 @@
3432
],
3533
classes => {
3634
'puppet_enterprise::profile::master' => {
37-
# lint:ignore:single_quote_string_with_variables
38-
'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_b_pool_address].filter |$_| { $_ },
39-
# lint:endignore
35+
'puppetdb_host' => [$internal_compiler_b_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
4036
'puppetdb_port' => [8081],
4137
},
4238
},
@@ -58,9 +54,7 @@
5854
],
5955
classes => {
6056
'puppet_enterprise::profile::master' => {
61-
# lint:ignore:single_quote_string_with_variables
62-
'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_a_pool_address].filter |$_| { $_ },
63-
# lint:endignore
57+
'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_b_pool_address].filter |$_| { $_ },
6458
'puppetdb_port' => [8081],
6559
},
6660
},

manifests/setup/node_manager.pp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -209,9 +209,7 @@
209209
],
210210
classes => {
211211
'puppet_enterprise::profile::master' => {
212-
# lint:ignore:single_quote_string_with_variables
213-
'puppetdb_host' => ['${trusted[\'certname\']}'],
214-
# lint:endignore
212+
'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_b_pool_address].filter |$_| { $_ },
215213
'puppetdb_port' => [8081],
216214
},
217215
},
@@ -229,9 +227,7 @@
229227
],
230228
classes => {
231229
'puppet_enterprise::profile::master' => {
232-
# lint:ignore:single_quote_string_with_variables
233-
'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_b_pool_address].filter |$_| { $_ },
234-
# lint:endignore
230+
'puppetdb_host' => [$internal_compiler_b_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
235231
'puppetdb_port' => [8081],
236232
},
237233
},
@@ -255,9 +251,7 @@
255251
],
256252
classes => {
257253
'puppet_enterprise::profile::master' => {
258-
# lint:ignore:single_quote_string_with_variables
259-
'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_a_pool_address].filter |$_| { $_ },
260-
# lint:endignore
254+
'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
261255
'puppetdb_port' => [8081],
262256
},
263257
},

0 commit comments

Comments
 (0)