Support camptocamp/systemd 3.x

.fixtures.yml

@@ -12,6 +12,4 @@ fixtures:
       repo:           'https://github.com/puppetlabs/puppetlabs-selinux_core'
       puppet_version: '>= 6.0.0'
     stdlib:           'https://github.com/puppetlabs/puppetlabs-stdlib'
-    systemd:
-      repo: 'https://github.com/camptocamp/puppet-systemd'
-      ref: '2.12.0'
+    systemd:          'https://github.com/camptocamp/puppet-systemd'

manifests/service.pp

@@ -37,11 +37,23 @@
     content => template('pulpcore/[email protected]'),
   }
 
+  # In camptocamp/systemd 3.0.0 support for Puppet < 6.1.0 was dropped.
+  # This means there is no single daemon-reload class anymore. This also means
+  # there is no more relation that ensures all services are loaded prior to running them.
+  $metadata = load_module_metadata('systemd')
+  if SemVer($metadata['version']) >= SemVer('3.0.0') {
+    Systemd::Unit_file['pulpcore-api.socket']  -> Systemd::Unit_file['pulpcore-api.service']
+    Systemd::Unit_file['pulpcore-content.socket']  -> Systemd::Unit_file['pulpcore-content.service']
+    $reload_require = undef
+  } else {
+    $reload_require = Class['systemd::systemctl::daemon_reload']
+  }
+
   Integer[1, $pulpcore::worker_count].each |$n| {
     service { "pulpcore-worker@${n}.service":
       ensure    => $pulpcore::service_ensure,
       enable    => $pulpcore::service_enable,
-      require   => Class['systemd::systemctl::daemon_reload'],
+      require   => $reload_require,
       subscribe => Systemd::Unit_file['[email protected]'],
     }
   }
@@ -53,7 +65,7 @@
         service { $worker:
           ensure  => false,
           enable  => false,
-          require => [Systemd::Unit_file['[email protected]'], Class['systemd::systemctl::daemon_reload']],
+          require => [Systemd::Unit_file['[email protected]'], $reload_require],
         }
       }
     }

metadata.json

@@ -28,7 +28,7 @@
     },
     {
       "name": "camptocamp/systemd",
-      "version_requirement": ">= 2.2.0 < 3.0.0"
+      "version_requirement": ">= 2.2.0 < 4.0.0"
     },
     {
       "name": "puppet/extlib",

spec/classes/pulpcore_spec.rb

@@ -119,6 +119,10 @@
 
         it 'configures services' do
           is_expected.to contain_class('pulpcore::service')
+          is_expected.to contain_systemd__unit_file('pulpcore-api.socket').that_comes_before('Systemd::Unit_file[pulpcore-api.service]')
+          is_expected.to contain_systemd__unit_file('pulpcore-api.service').that_requires('Systemd::Unit_file[pulpcore-api.socket]')
+          is_expected.to contain_systemd__unit_file('pulpcore-content.socket').that_comes_before('Systemd::Unit_file[pulpcore-content.service]')
+          is_expected.to contain_systemd__unit_file('pulpcore-content.service').that_requires('Systemd::Unit_file[pulpcore-content.socket]')
           is_expected.to contain_systemd__unit_file('pulpcore-resource-manager.service')
           is_expected.to contain_systemd__unit_file('[email protected]')
           is_expected.to contain_service("[email protected]").with_ensure(true)