Add option to purge non-managed networkd files

REFERENCE.md

@@ -88,6 +88,8 @@ The following parameters are available in the `systemd` class:
 * [`logind_settings`](#logind_settings)
 * [`loginctl_users`](#loginctl_users)
 * [`dropin_files`](#dropin_files)
+* [`manage_all_network_files`](#manage_all_network_files)
+* [`network_path`](#network_path)
 * [`manage_accounting`](#manage_accounting)
 * [`accounting`](#accounting)
 * [`purge_dropin_dirs`](#purge_dropin_dirs)
@@ -309,6 +311,18 @@ Configure dropin files via hiera with factory pattern
 
 Default value: `{}`
 
+##### <a name="manage_all_network_files"></a>`manage_all_network_files`
+
+Data type: `Boolean`
+
+
+
+##### <a name="network_path"></a>`network_path`
+
+Data type: `Stdlib::Absolutepath`
+
+where all networkd files are placed in
+
 ##### <a name="manage_accounting"></a>`manage_accounting`
 
 Data type: `Boolean`

data/common.yaml

@@ -32,3 +32,5 @@ systemd::udev_timeout_signal: ~
 systemd::udev_resolve_names: ~
 systemd::manage_logind: false
 systemd::logind_settings: {}
+systemd::manage_all_network_files: false
+systemd::network_path: '/etc/systemd/network'

manifests/init.pp

@@ -112,6 +112,11 @@
 #
 # @param dropin_files
 #   Configure dropin files via hiera with factory pattern
+#
+# @param manage_all_network_files
+#
+# @param network_path
+#   where all networkd files are placed in
 class systemd (
   Hash[String,Hash[String, Any]]                         $service_limits,
   Boolean                                                $manage_resolved,
@@ -146,6 +151,8 @@
   Optional[Variant[Integer,String]]                      $udev_timeout_signal,
   Boolean                                                $manage_logind,
   Systemd::LogindSettings                                $logind_settings,
+  Boolean                                                $manage_all_network_files,
+  Stdlib::Absolutepath                                   $network_path,
   Hash                                                   $loginctl_users = {},
   Hash                                                   $dropin_files = {},
   Hash                                                   $udev_rules = {},

manifests/networkd.pp

@@ -1,12 +1,14 @@
 # @api private
 #
-# This class provides an abstract way to trigger systemd-networkd
-#
-# @param ensure
-#   The state that the ``networkd`` service should be in
+# @summary This class provides an abstract way to trigger systemd-networkd
 #
+# @param ensure The state that the ``networkd`` service should be in
+# @param path path where all networkd files are placed in
+# @param manage_all_network_files if enabled, all networkd files that aren't managed by puppet will be purged
 class systemd::networkd (
   Enum['stopped','running'] $ensure = $systemd::networkd_ensure,
+  Stdlib::Absolutepath $path = $systemd::network_path,
+  Boolean $manage_all_network_files = $systemd::manage_all_network_files,
 ) {
   assert_private()
 
@@ -20,4 +22,14 @@
     ensure => $ensure,
     enable => $_enable_networkd,
   }
+  # this directory is created by systemd
+  # we define it here to purge non-managed files
+  if $manage_all_network_files {
+    file { $path:
+      ensure  => 'directory',
+      recurse => true,
+      purge   => true,
+      notify  => Service['systemd-networkd'],
+    }
+  }
 }

spec/classes/init_spec.rb

@@ -27,6 +27,7 @@
           it { is_expected.to create_service('systemd-resolved').with_enable(true) }
           it { is_expected.to create_service('systemd-networkd').with_ensure('running') }
           it { is_expected.to create_service('systemd-networkd').with_enable(true) }
+          it { is_expected.not_to contain_file('/etc/systemd/network') }
         end
 
         context 'when enabling resolved with DNS values (string)' do
@@ -439,6 +440,18 @@
 
           it { is_expected.to contain_systemd__dropin_file('my-foo.conf').with_content('[Service]\nReadWritePaths=/') }
         end
+        context 'with managed networkd directory' do
+          let :params do
+            {
+              manage_networkd: true,
+              manage_all_network_files: true
+            }
+          end
+
+          it { is_expected.to compile.with_all_deps }
+          it { is_expected.to contain_class('systemd::networkd') }
+          it { is_expected.to contain_file('/etc/systemd/network').with_ensure('directory') }
+        end
       end
     end
   end