From 876bcd0d9eed0b74daf8658c9d558ac7cdf2ff11 Mon Sep 17 00:00:00 2001
From: Cody Herriges <193064+ody@users.noreply.github.com>
Date: Mon, 29 Aug 2022 22:29:30 +0000
Subject: [PATCH] Fix-ups in copy_file plan usage

Fixes unnoticed items that were missed in the usage of copy_file
---
 plans/subplans/configure.pp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/plans/subplans/configure.pp b/plans/subplans/configure.pp
index c00ac6e8..3d5a506a 100644
--- a/plans/subplans/configure.pp
+++ b/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
     )