(PE-36580) Remove fail_plan for r10k_known_hosts

Since we aren't testing whether r10k_remote using git@ or ssh:// also
has r10k_private_key set, testing for r10k_known_hosts seems like
overkill. Removing that plan_fail, and setting r10k_known_hosts directly
in the generate_pe_conf call alongside the other r10k parameters.

It's true that this parameter only exists in 2023.3+, but
peadm::generate_pe_conf() will drop parameters with undef values, and if
r10k_known_hosts is explicitly set by mistake by a user on an earlier
version than 2023.3, an unmatched parameter in pe.conf hiera is not
fatal.

Author: jpartlow

plans/subplans/install.pp

@@ -13,9 +13,10 @@
 #
 # @param r10k_known_hosts
 #   Puppet Enterprise 2023.3+ requires host key verification for the
-#   r10k_remote host. When setting \$r10k_private_key, you must also provide
-#   \$r10k_known_hosts information in the form of an array of hashes with
-#   'name', 'type' and 'key' information for hostname, key-type and public key.
+#   r10k_remote host when using ssh. When setting \$r10k_private_key, you must
+#   also provide \$r10k_known_hosts information in the form of an array of
+#   hashes with 'name', 'type' and 'key' information for hostname, key-type and
+#   public key.
 #
 # @param license_key_file
 #   The license key to use with Puppet Enterprise.  If this is a local file it
@@ -132,20 +133,6 @@
   # either be undef or else the key content to write.
   $r10k_private_key = peadm::file_or_content('r10k_private_key', $r10k_private_key_file, $r10k_private_key_content)
 
-  # Determine whether r10k_known_hosts is required and has been provided.
-  $is_pe_2023_3_or_greater = (versioncmp($version, '2023.3.0') >= 0)
-  if (($is_pe_2023_3_or_greater) and
-      ($r10k_private_key =~ NotUndef) and
-      ($r10k_known_hosts =~ Undef)) {
-    fail_plan("In Puppet Enterprise 2023.3+ r10k 4.0 requires host key verification for the r10k_remote host. When setting \$r10k_private_key, you must also provide \$r10k_known_hosts information in the form of an array of hashes with 'name', 'type' and 'key' information for hostname, key-type and public key. Puppet Enterprise version: ${version}, r10k_known_hosts: ${r10k_known_hosts}")
-  }
-  $r10k_known_hosts_config = $r10k_known_hosts ? {
-    undef   => {},
-    default => {
-      'puppet_enterprise::profile::master::r10k_known_hosts' => $r10k_known_hosts,
-    },
-  }
-
   # Process user input for license key (same process as for r10k private key above).
   $license_key = peadm::file_or_content('license_key', $license_key_file, $license_key_content)
 
@@ -191,7 +178,8 @@
         undef   => undef,
         default => '/etc/puppetlabs/puppetserver/ssh/id-control_repo.rsa',
       },
-  } + $r10k_known_hosts_config + $puppetdb_database_temp_config + $pe_conf_data)
+      'puppet_enterprise::profile::master::r10k_known_hosts'            => $r10k_known_hosts,
+  } + $puppetdb_database_temp_config + $pe_conf_data)
 
   $primary_postgresql_pe_conf = peadm::generate_pe_conf({
       'console_admin_password'                => 'not used',

spec/plans/subplans/install_spec.rb

@@ -59,21 +59,6 @@
     expect(run_plan('peadm::subplans::install', params)).to be_ok
   end
 
-  it 'fails if 2023.3+ and r10k_private_key set but r10k_known_hosts not set' do
-    params = {
-      'primary_host'             => 'primary',
-      'console_password'         => 'puppetlabs',
-      'version'                  => '2023.3.0',
-      'r10k_remote'              => '[email protected]:puppetlabs/nothing',
-      'r10k_private_key_content' => '-----BEGINfoo',
-      'permit_unsafe_versions'   => true,
-    }
-
-    result = run_plan('peadm::subplans::install', params)
-    expect(result).not_to be_ok
-    expect(result.value.message).to match(%r{Puppet Enterprise 2023\.3\+ .*requires host key verification})
-  end
-
   it 'installs 2023.3+ with r10k_private_key and r10k_known_hosts' do
     params = {
       'primary_host'             => 'primary',