(PE-40377) final fix for download path and updated final checks

Author: davidmalloncares

plans/migrate.pp

@@ -14,19 +14,12 @@
   $backup_file = run_plan('peadm::backup', $old_primary_host, {
       backup_type => 'migration',
   })
-  out::message("Backup file: ${backup_file}")
-  out::message("Backup file path: ${backup_file['path']}")
-  $down_results = download_file($backup_file['path'], 'backup', $old_primary_host)
-  out::message("Download results: ${down_results}")
-  $download_path = $down_results[0]['path']
 
-  out::message("Download path: ${download_path}")
+  $download_results = download_file($backup_file['path'], 'backup', $old_primary_host)
+  $download_path = $download_results[0]['path']
+
   $backup_filename = basename($backup_file['path'])
   $remote_backup_path = "/tmp/${backup_filename}"
-  $current_dir = system::env('PWD')
-  out::message("backup_filename: ${backup_filename}")
-  out::message("remote_backup_path: ${remote_backup_path}")
-  out::message("current_dir: ${current_dir}")
 
   upload_file($download_path, $remote_backup_path, $new_primary_host)
 

spec/acceptance/peadm_spec/plans/test_migration.pp

@@ -56,8 +56,8 @@
   }
 
   # get the config from new_primary_target and verify config looks as expected
-  $result = run_task('peadm::get_peadm_config', $new_primary_target, '_catch_errors' => true).first.to_data()
-  out::message("peadm_config: ${result}")
+  $peadm_config = run_task('peadm::get_peadm_config', $new_primary_target, '_catch_errors' => true).first.to_data()
+  out::message("peadm_config: ${peadm_config}")
   # if new_replica_target is supplied then check that is in the expected place in the config
   if $new_replica_target {
     if $peadm_config['params']['replica_host'] == $new_replica_target {