Merge pull request #282 from ody/copy_file_fix_ups

Fix-ups in copy_file plan usage

Author: davidsandilands

Diff for: plans/subplans/configure.pp

@@ -59,18 +59,24 @@
   )
 
   # Source list of files on Primary and synchronize to new Replica
-  $content_sources = [
+  $common_content_source   = '/etc/puppetlabs/puppet/hiera.yaml'
+  $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/puppetlabs/puppet/hiera.yaml'
   ]
-  parallelize($content_sources) |$path| {
-    run_plan('peadm::util::copy_file', peadm::flatten_compact([
-      $replica_target,
-      $compiler_targets,
-    ]),
+
+  run_plan('peadm::util::copy_file', peadm::flatten_compact([
+    $replica_target,
+    $compiler_targets,
+  ]),
+    source_host   => $primary_target,
+    path          => $common_content_source
+  )
+
+  parallelize($replica_content_sources) |$path| {
+    run_plan('peadm::util::copy_file', $replica_target,
       source_host   => $primary_target,
       path          => $path
     )