looks like facter virtual doesnt work in docker on gha

Author: h0tw1r3

spec/support/acceptance/shared/puppetdb.rb

@@ -16,16 +16,14 @@
         gpgkey => "file:///etc/pki/rpm-gpg/${gpg_key_file}",
       }
 
-      if $facts['virtual'] == 'docker' {
-        # 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['puppetdb'],
-          notify             => Service['puppetdb'],
-        }
+      # 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['puppetdb'],
+        notify             => Service['puppetdb'],
       }
     }
 

spec/support/acceptance/shared/puppetserver.pp

@@ -25,23 +25,21 @@
     -> Package <| tag == 'postgresql' |>
   }
 
-  if $facts['virtual'] == 'docker' {
-    # 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['puppetserver'],
-      notify             => Service['puppetserver'],
-    }
+  # 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['puppetserver'],
+    notify             => Service['puppetserver'],
   }
 }
 
@@ -69,7 +67,6 @@
   context => "/files${sysconfdir}/puppetserver",
   changes => [
     'set JAVA_ARGS \'"-Xms512m -Djruby.logger.class=com.puppetlabs.jruby_utils.jruby.Slf4jLogger"\'',
-    "set START_TIMEOUT '30'",
   ],
 }
 -> service { 'puppetserver':