moving to start of plan

Author: B00885424

plans/install.pp

@@ -75,6 +75,17 @@
   Boolean                    $permit_unsafe_versions = false,
   String                     $token_lifetime         = '1y',
 ) {
+  # 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,
+    'version' => $version,
+  })
+
   peadm::assert_supported_bolt_version()
 
   peadm::assert_supported_pe_version($version, $permit_unsafe_versions)
@@ -142,16 +153,6 @@
     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,
-    'version' => $version,
-  })
 
   # Return a string banner reporting on what was done
   return([$install_result, $configure_result])

plans/migrate.pp

@@ -15,6 +15,17 @@
   Optional[String] $upgrade_version = undef,
   Optional[Peadm::SingleTargetSpec] $replica_host = undef,
 ) {
+    # 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,
+    'version' => $version,
+  })
+  
   # pre-migration checks
   out::message('This plan is a work in progress and it is not recommended to be used until it is fully implemented and supported')
   peadm::assert_supported_bolt_version()

plans/upgrade.pp

@@ -62,6 +62,16 @@
 
   Optional[Peadm::UpgradeSteps] $begin_at_step = undef,
 ) {
+  # 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,
+    'version' => $version,
+  })
+
   out::message('# Validating inputs')
 
   # Ensure input valid for a supported architecture
@@ -445,15 +455,5 @@
 
   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,
-    'version' => $version,
-  })
-
   return("Upgrade of Puppet Enterprise ${arch['architecture']} completed.")
 }