Merge pull request #315 from Sharpie/fix-errors-in-convert-finalize

davidsandilands · web-flow · commit bfbeed4e3b27 · 2023-01-26T11:31:54.000Z
Fix XL failures in finalize step of peadm::convert
diff --git a/plans/convert.pp b/plans/convert.pp
@@ -246,7 +246,8 @@
     # Restart cluster compiler services that are likely not restarted by our
     # final Puppet run to increase chance everything is functional upon plan
     # completion
-    run_command('systemctl restart pe-puppetserver.service pe-puppetdb.service', $all_targets - $primary_target)
+    run_command('systemctl restart pe-puppetserver.service pe-puppetdb.service',
+                $all_targets - $primary_target - $primary_postgresql_target - $replica_postgresql_target)
   }
 
   return("Conversion to peadm Puppet Enterprise ${arch['architecture']} completed.")

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,8 @@`
`246`	`246`	`# Restart cluster compiler services that are likely not restarted by our`
`247`	`247`	`# final Puppet run to increase chance everything is functional upon plan`
`248`	`248`	`# completion`
`249`		`- run_command('systemctl restart pe-puppetserver.service pe-puppetdb.service', $all_targets - $primary_target)`
	`249`	`+ run_command('systemctl restart pe-puppetserver.service pe-puppetdb.service',`
	`250`	`+ $all_targets - $primary_target - $primary_postgresql_target - $replica_postgresql_target)`
`250`	`251`	`}`
`251`	`252`
`252`	`253`	`return("Conversion to peadm Puppet Enterprise ${arch['architecture']} completed.")`