fixing some duplicate lines caused by the squash

Author: B00885424

plans/install.pp

@@ -90,7 +90,6 @@
 
   peadm::assert_supported_pe_version($version, $permit_unsafe_versions)
 
-<<<<<<< HEAD
   # Log parameters for debugging 
   peadm::log_plan_params({
     'primary_host' => $primary_host,
@@ -106,8 +105,6 @@
 
   peadm::assert_supported_pe_version($version, $permit_unsafe_versions)
 
-=======
->>>>>>> 431141a (move declaration)
   $install_result = run_plan('peadm::subplans::install',
     # Standard
     primary_host                   => $primary_host,

plans/upgrade.pp

@@ -83,17 +83,6 @@
     $compiler_hosts,
   )
 
-  # Log parameters for debugging
-  peadm::log_plan_params({
-    '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)

spec/plans/install_spec.rb

@@ -9,8 +9,6 @@
       expect_plan('peadm::subplans::install')
       expect_plan('peadm::subplans::configure')
       expect(run_plan('peadm::install', 'primary_host' => 'primary', 'console_password' => 'puppetLabs123!', 'version' => '2021.7.9')).to be_ok
-      allow(Out).to receive(:message).and_return(true)
-      expect(Out).to eq(true)
     end
   end
 end