Re-use sync_global_hiera plan

Modifies the peadm::util::sync_global_hera plan so that it can handle
the copying of many files from a source to a group of targets. Renames
the plan to peadm::util::copy_file

Author: ody

plans/add_compiler.pp

@@ -111,8 +111,9 @@
   )
 
   # Source the global hiera.yaml from Primary and synchronize to new compiler
-  run_plan('peadm::util::sync_global_hiera', $compiler_target,
-    primary_host => $primary_target
+  run_plan('peadm::util::copy_file', $compiler_target,
+    source_host => $primary_target,
+    path        => '/etc/puppetlabs/puppet/hiera.yaml'
   )
 
   # On <compiler-host>, run the puppet agent

plans/add_replica.pp

@@ -97,11 +97,21 @@
     peadm_config                     => $peadm_config
   )
 
-  # Source the global hiera.yaml from Primary and synchronize to new Replica 
-  # Provision the new system as a replica
-  run_plan('peadm::util::sync_global_hiera', $replica_target,
-    primary_host => $primary_target
-  )
+  # Source list of files on Primary and synchronize to new Replica
+  $content_sources = [
+    '/opt/puppetlabs/server/data/console-services/certs/ad_ca_chain.pem',
+    '/etc/puppetlabs/orchestration-services/conf.d/secrets/keys.json',
+    '/etc/puppetlabs/orchestration-services/conf.d/secrets/orchestrator-encryption-keys.json',
+    '/etc/puppetlabs/console-services/conf.d/secrets/keys.json',
+    '/etc/puuppetlabs/puppet/hiera.yaml'
+  ]
+  parallelize($content_sources) |$path| {
+    run_plan('peadm::util::copy_file', $replica_target,
+      source_host   => $primary_target,
+      path          => $path,
+      _catch_errors => true
+    )
+  }
 
   # Provision the new system as a replica
   run_task('peadm::provision_replica', $primary_target,

plans/subplans/configure.pp

@@ -58,23 +58,21 @@
     $compiler_hosts,
   )
 
-  # Define the global hiera.yaml file on the Master; and syncronize to any Replica and Compilers.
-  # This enables Data in the Classifier/Console, which is used/required by this architecture.
-  # Necessary, for example, when promoting the Replica due to PE-18400 (and others).
-  $global_hiera_yaml = run_task('peadm::read_file', $primary_target,
-    path => '/etc/puppetlabs/puppet/hiera.yaml',
-  ).first['content']
-
-  run_task('peadm::mkdir_p_file', peadm::flatten_compact([
-    $replica_target,
-    $compiler_targets,
-  ]),
-    path    => '/etc/puppetlabs/puppet/hiera.yaml',
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
-    content => $global_hiera_yaml,
-  )
+  # Source list of files on Primary and synchronize to new Replica
+  $content_sources = [
+    '/opt/puppetlabs/server/data/console-services/certs/ad_ca_chain.pem',
+    '/etc/puppetlabs/orchestration-services/conf.d/secrets/keys.json',
+    '/etc/puppetlabs/orchestration-services/conf.d/secrets/orchestrator-encryption-keys.json',
+    '/etc/puppetlabs/console-services/conf.d/secrets/keys.json',
+    '/etc/puuppetlabs/puppet/hiera.yaml'
+  ]
+  parallelize($content_sources) |$path| {
+    run_plan('peadm::util::copy_file', $replica_target,
+      source_host => $primary_target,
+      path         => $path,
+      _catch_errors => true
+    )
+  }
 
   # Set up the console node groups to configure the various hosts in their roles
 

plans/util/copy_file.pp

@@ -0,0 +1,22 @@
+# @api private
+plan peadm::util::copy_file(
+  Peadm::SingleTargetSpec $targets,
+  Peadm::SingleTargetSpec $source_host,
+  String[1]               $path
+) {
+
+  $source_target   = peadm::get_targets($source_host, 1)
+  $replica_target  = $targets
+
+  $source_content = run_task('peadm::read_file', $source_target,
+    path => $path
+  ).first['content']
+
+  run_task('peadm::mkdir_p_file', $replica_target,
+    path    => $path,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0644',
+    content => $source_content,
+  )
+}