Merge branch 'puppet-service-ensure'

Author: reidmv

Diff for: plans/action/configure.pp

@@ -146,5 +146,14 @@
     )
   }
 
+  # Ensure Puppet agent service is running now that configuration is complete
+  run_command('systemctl start puppet', peadm::flatten_compact([
+    $master_target,
+    $master_replica_target,
+    $puppetdb_database_target,
+    $puppetdb_database_replica_target,
+    $compiler_targets,
+  ]))
+
   return("Configuration of Puppet Enterprise ${arch['architecture']} succeeded.")
 }

Diff for: plans/action/install.pp

@@ -205,6 +205,7 @@
       _catch_errors         => $shortcircuit_puppetdb,
       tarball               => $upload_tarball_path,
       peconf                => '/tmp/pe.conf',
+      puppet_service_ensure => 'stopped',
       shortcircuit_puppetdb => $shortcircuit_puppetdb,
     )
     out::message("Finished: task peadm::pe_install on ${master_target[0].name}")
@@ -232,8 +233,9 @@
 
   # Run the PE installer on the puppetdb database hosts
   run_task('peadm::pe_install', $database_targets,
-    tarball => $upload_tarball_path,
-    peconf  => '/tmp/pe.conf',
+    tarball               => $upload_tarball_path,
+    peconf                => '/tmp/pe.conf',
+    puppet_service_ensure => 'stopped',
   )
 
   # Now that the main PuppetDB database node is ready, finish priming the

Diff for: tasks/pe_install.json

@@ -12,6 +12,10 @@
     "shortcircuit_puppetdb": {
       "type": "Optional[Boolean]",
       "description": "If true, during install, configure PuppetDB to short-circuit its startup"
+    },
+    "puppet_service_ensure": {
+      "type": "Optional[Enum['stopped']]",
+      "description": "If 'stopped', ensure the Puppet agent is not running when install completes"
     }
   },
   "input_method": "environment",

Diff for: tasks/pe_install.sh

@@ -31,3 +31,7 @@ if [ "$PT_shortcircuit_puppetdb" = "true" ]; then
 	rm /etc/systemd/system/pe-puppetdb.service.d/10-shortcircuit.conf
 	systemctl daemon-reload
 fi
+
+if [ "$PT_puppet_service_ensure" = "stopped" ]; then
+	systemctl stop puppet.service
+fi