move declaration

Author: B00885424

plans/install.pp

@@ -79,18 +79,6 @@
 
   peadm::assert_supported_pe_version($version, $permit_unsafe_versions)
 
-  # Log parameters for debugging 
-  peadm::log_plan_parameters({
-    'primary_host' => $primary_host,
-    'replica_host' => $replica_host,
-    'compiler_hosts' => $compiler_hosts,
-    'legacy_compilers' => $legacy_compilers,
-    'primary_postgresql_host' => $primary_postgresql_host,
-    'replica_postgresql_host' => $replica_postgresql_host,
-    'begin_at_step' => $begin_at_step,
-    'version' => $version,
-  })
-
   $install_result = run_plan('peadm::subplans::install',
     # Standard
     primary_host                   => $primary_host,
@@ -154,6 +142,17 @@
     stagingdir                       => $stagingdir,
     final_agent_state                => $final_agent_state,
   )
+  # Log parameters for debugging 
+  peadm::log_plan_parameters({
+    'primary_host' => $primary_host,
+    'replica_host' => $replica_host,
+    'compiler_hosts' => $compiler_hosts,
+    'legacy_compilers' => $legacy_compilers,
+    'primary_postgresql_host' => $primary_postgresql_host,
+    'replica_postgresql_host' => $replica_postgresql_host,
+    'begin_at_step' => $begin_at_step,
+    'version' => $version,
+  })
 
   # Return a string banner reporting on what was done
   return([$install_result, $configure_result])

plans/upgrade.pp

@@ -73,17 +73,6 @@
     $compiler_hosts,
   )
 
-  # Log parameters for debugging
-  peadm::log_plan_parameters({
-    'primary_host' => $primary_host,
-    'replica_host' => $replica_host,
-    'compiler_hosts' => $compiler_hosts,
-    'primary_postgresql_host' => $primary_postgresql_host,
-    'replica_postgresql_host' => $replica_postgresql_host,
-    'begin_at_step' => $begin_at_step,
-    'version' => $version,
-  })
-
   # Convert inputs into targets.
   $primary_target            = peadm::get_targets($primary_host, 1)
   $replica_target            = peadm::get_targets($replica_host, 1)
@@ -456,5 +445,16 @@
 
   peadm::check_version_and_known_hosts($current_pe_version, $_version, $r10k_known_hosts)
 
+    # Log parameters for debugging
+  peadm::log_plan_parameters({
+    'primary_host' => $primary_host,
+    'replica_host' => $replica_host,
+    'compiler_hosts' => $compiler_hosts,
+    'primary_postgresql_host' => $primary_postgresql_host,
+    'replica_postgresql_host' => $replica_postgresql_host,
+    'begin_at_step' => $begin_at_step,
+    'version' => $version,
+  })
+
   return("Upgrade of Puppet Enterprise ${arch['architecture']} completed.")
 }