Merge pull request #330 from vchepkov/upgrade-agent-status

add parameter for setting final state of infrastructure agents after upgrade

Author: timidri

plans/subplans/configure.pp

@@ -150,7 +150,7 @@
     )
   }
 
-  # Ensure Puppet agent service is running now that configuration is complete
+  # Configure Puppet agent service status now that configuration is complete
   $systemctl_state = $final_agent_state ? {
     'running' => 'start',
     'stopped' => 'stop'

plans/upgrade.pp

@@ -16,6 +16,9 @@
 #   specified, PEAdm will attempt to download PE installation media from its
 #   standard public source. When specified, PEAdm will download directly from the
 #   URL given.
+# @param final_agent_state
+#   Configures the state the puppet agent should be in on infrastructure nodes
+#   after PE is upgraded successfully.
 #
 plan peadm::upgrade (
   # Standard
@@ -37,10 +40,11 @@
   Optional[String]            $internal_compiler_b_pool_address = undef,
 
   # Other
-  Optional[String]      $token_file             = undef,
-  String                $stagingdir             = '/tmp',
-  Enum[direct,bolthost] $download_mode          = 'bolthost',
-  Boolean               $permit_unsafe_versions = false,
+  Optional[String]           $token_file             = undef,
+  String                     $stagingdir             = '/tmp',
+  Enum['running', 'stopped'] $final_agent_state      = 'running',
+  Enum[direct,bolthost]      $download_mode          = 'bolthost',
+  Boolean                    $permit_unsafe_versions = false,
 
   Optional[Enum[
       'upgrade-primary',
@@ -349,9 +353,13 @@
   }
 
   peadm::plan_step('finalize') || {
-    # Ensure Puppet running on all infrastructure targets
+    $service_state = $final_agent_state ? {
+      'running' => 'start',
+      'stopped' => 'stop'
+    }
+    # Configure Puppet agent service status on all infrastructure targets
     run_task('service', $all_targets,
-      action => 'start',
+      action => $service_state,
       name   => 'puppet',
     )
   }