Merge pull request #77 from puppetlabs/GH-73

Rework upgrade sequence to support Standard arch

Author: reidmv

Diff for: 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',