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.
puppetlabs · Sep 11, 2024 · 6472fed · 6472fed
1 parent 14a5900
commit 6472fed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/manifests/setup/legacy_compiler_group.pp b/manifests/setup/legacy_compiler_group.pp
@@ -16,9 +16,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}'],
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },
@@ -34,9 +32,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_b_pool_address].filter |$_| { $_ },
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_b_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },
@@ -58,9 +54,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_a_pool_address].filter |$_| { $_ },
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_b_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },

diff --git a/manifests/setup/node_manager.pp b/manifests/setup/node_manager.pp
@@ -209,9 +209,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}'],
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_b_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },
@@ -229,9 +227,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_b_pool_address].filter |$_| { $_ },
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_b_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },
@@ -255,9 +251,7 @@
     ],
     classes => {
       'puppet_enterprise::profile::master'   => {
-        # lint:ignore:single_quote_string_with_variables
-        'puppetdb_host' => ['${trusted[\'certname\']}', $internal_compiler_a_pool_address].filter |$_| { $_ },
-        # lint:endignore
+        'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
         'puppetdb_port' => [8081],
       },
     },