adding reviewed changes from github, fixing errors that variable names were causing

Author: B00885424

plans/migrate.pp

@@ -27,7 +27,8 @@
   $all_hosts = peadm::flatten_compact([
     $old_primary_host,
     $new_primary_host,
-    $replica_host ? { undef => [], default => [$replica_host] }
+    $replica_host ? { undef => [], default => [$replica_host] },
+    $primary_postgresql_host ? { undef => [], default => [$primary_postgresql_host] }
   ].flatten)
   run_command('hostname', $all_hosts)  # verify can connect to targets
 

spec/acceptance/peadm_spec/plans/test_migration.pp

@@ -2,7 +2,6 @@
   String $primary_host,
   String $new_primary_host,
   Optional[String] $new_replica_host = undef,
-  Optional[String] $primary_postgresql_host = undef,
   Optional[String] $new_primary_postgresql_host = undef,
   Optional[String] $new_replica_postgresql_host = undef,
   Optional[String] $upgrade_version = undef,
@@ -11,7 +10,6 @@
   $primary_target = $primary_host ? { '' => undef, default => peadm::get_targets($primary_host, 1) }
   $new_primary_target = $new_primary_host ? { '' => undef, default => peadm::get_targets($new_primary_host, 1) }
   $new_replica_target = $new_replica_host ? { '' => undef, default => peadm::get_targets($new_replica_host, 1) }
-  $primary_postgresql_target = $primary_postgresql_host ? { '' => undef, default => peadm::get_targets($primary_postgresql_host, 1) }
   $new_primary_postgresql_target = $new_primary_postgresql_host ? { '' => undef, default => peadm::get_targets($new_primary_postgresql_host, 1) }
   $new_replica_postgresql_target = $new_replica_postgresql_host ? { '' => undef, default => peadm::get_targets($new_replica_postgresql_host, 1) }
 
@@ -32,8 +30,7 @@
     new_primary_host => $new_primary_target,
     upgrade_version => $upgrade_version,
     replica_host => $new_replica_target,
-    primary_postgresql_host => $primary_postgresql_target,
-    new_primary_postgresql_host => $new_primary_postgresql_target,
+    primary_postgresql_host => $new_primary_postgresql_target,
   )
 
   # run infra status on the new primary