(maint) Merge up b8c025b to main

Generated by CI

* commit 'b8c025b5416e944ae2c04948fad1ae6f8a7827bb':
  (maint) disable dropsonde during acceptance tests

Author: puppetlabs-jenkins

acceptance/suites/pre_suite/foss/80_configure_puppet.rb

@@ -15,7 +15,8 @@
     end
   end
 
-  config = { 'certificate-authority' => { 'allow-subject-alt-names' => true }}
+  config = { 'certificate-authority' => { 'allow-subject-alt-names' => true },
+             'dropsonde' => { 'enabled' => false }}
   path = '/etc/puppetlabs/puppetserver/conf.d/puppetserver.conf'
   modify_tk_config(master, path, config)
 end