disable dropsonde/pidfile workarounds

We fixed that in ezbake already.

Author: bastelfreak

spec/support/acceptance/shared/puppetdb.rb

@@ -3,18 +3,6 @@
 shared_examples 'puppetdb' do
   let(:pp) do
     <<~PP
-      if $facts['os']['family'] == 'RedHat' {
-        # Work-around EL systemd in docker bug affecting forked services
-        file_line { 'puppetdb-unit-remove-pidfile':
-          path               => '/lib/systemd/system/puppetdb.service',
-          line               => '#PIDFile=/run/puppetlabs/puppetdb/puppetdb.pid',
-          match              => '^PIDFile.*',
-          append_on_no_match => false,
-          require            => Package['openvoxdb'],
-          notify             => Service['puppetdb'],
-        }
-      }
-
       # reduce pgs memory
       postgresql::server::config_entry { 'max_connections': value => '20' }
       postgresql::server::config_entry { 'shared_buffers': value => '128kB' }

spec/support/acceptance/shared/puppetserver.pp

@@ -24,23 +24,6 @@
     -> Package['disable-dnf-postgresql-module']
     -> Package <| tag == 'postgresql' |>
   }
-
-  # Work-around EL systemd in docker with cgroupsv1? issue and forked services
-  # Without this, the puppet agent will stall for 300 seconds waiting for
-  # the service to start... then miserably fail.
-  # systemd error message:
-  #     New main PID 1411 does not belong to service, and PID file is not
-  #     owned by root. Refusing.
-  # PIDFile is not needed, but it cannot be reset by a drop-in, therefor the
-  # original unit must be modified
-  file_line { 'puppetserver-unit-remove-pidfile':
-    path               => '/lib/systemd/system/puppetserver.service',
-    line               => '#PIDFile=/run/puppetlabs/puppetserver.pid',
-    match              => '^PIDFile.*',
-    append_on_no_match => false,
-    require            => Package['openvox-server'],
-    notify             => Service['puppetserver'],
-  }
 }
 
 $sysconfdir = $facts['os']['family'] ? {
@@ -63,14 +46,6 @@
 package { $puppetserver_package:
   ensure => installed,
 }
-# savagely disable dropsonde
-~> file {
-  [
-    '/opt/puppetlabs/server/data/puppetserver/dropsonde/bin/dropsonde',
-    '/opt/puppetlabs/server/apps/puppetserver/cli/apps/dropsonde',
-  ]:
-    ensure => absent,
-}
 -> exec { '/opt/puppetlabs/bin/puppetserver ca setup':
   creates => '/etc/puppetlabs/puppetserver/ca/ca_crt.pem',
 }