Rework upgrade sequence to support Standard arch

Previously, when upgrading a standard architecture deployment, after the
master runs the puppet-enterprise-installer script auth for compilers
needs to be restored by a puppet agent run. However, the upgrade plan
only performed a run on the dedicated database host, which doesn't exist
in a standard install (the databases are all on the master).

This commit reworks the upgrade sequence such that the master and
replica recieve puppet runs at the appropriate points, along with the
database targets, to ensure that regardless of which node the
database(s) are located on the node will have a Puppet run to finalize
its config before upgrade moves on to the compilers.

Fixes #73

Author: reidmv

plans/upgrade.pp

@@ -116,7 +116,17 @@
 
   # Installer-driven upgrade will de-configure auth access for compilers.
   # Re-run Puppet immediately to fully re-enable
-  run_task('peadm::puppet_runonce', $puppetdb_database_target)
+  run_task('peadm::puppet_runonce', [
+    $master_target,
+    $puppetdb_database_target,
+  ])
+
+  # The master could restart orchestration services again, in which case we
+  # would have to wait for nodes to reconnect
+  if $all_targets.any |$target| { $target.protocol == 'pcp' } {
+    run_task('peadm::orchestrator_healthcheck', $master_target)
+    wait_until_available($all_targets, wait_time => 120)
+  }
 
   # Upgrade the compiler group A targets
   run_task('peadm::agent_upgrade', $compiler_m1_targets,
@@ -156,16 +166,6 @@
   # FINALIZE UPGRADE
   ###########################################################################
 
-  # Run Puppet on the master to finalize central settings
-  run_task('peadm::puppet_runonce', $master_target)
-
-  # The master could restart orchestration services, in which case we would
-  # have to wait for nodes to reconnect
-  if $all_targets.any |$target| { $target.protocol == 'pcp' } {
-    run_task('peadm::orchestrator_healthcheck', $master_target)
-    wait_until_available($all_targets, wait_time => 120)
-  }
-
   # Ensure Puppet running on all infrastructure targets
   run_task('service', $all_targets,
     action => 'start',