Refactor systemd_networkd::interface

manifests/public_ip.pp

@@ -30,32 +30,7 @@ class lysnetwork::public_ip (
       refreshonly => true,
     }
   } elsif versioncmp($facts['systemd_version'], '215') >= 0 {
-    case $facts['os']['family'] {
-      'RedHat': {
-        ensure_packages(['systemd-networkd'])
-      }
-      'Debian': {
-
-        package { 'resolvconf': ensure => absent }
-        service { 'networking':
-          enable => false,
-        }
-
-      }
-      default: {}
-    }
-
-    service { 'systemd-networkd':
-      enable => true,
-    }
-
-    file { '/etc/systemd/network':
-      ensure    => directory,
-      # purge   => true,
-      # recurse => true,
-    }
-
-    lysnetwork::systemd_networkd_interface { $iface:
+    ::lysnetwork::systemd_networkd::interface { $iface:
       addresses => [
         "${facts['networking']['ip']}/24",
         "2001:6b0:17:f0a0::${last_octet_16}/64",

manifests/systemd_networkd/base.pp

+class lysnetwork::systemd_networkd::base {
+    case $facts['os']['family'] {
+      'RedHat': {
+        ensure_packages(['systemd-networkd'])
+      }
+      'Debian': {
+
+        package { 'resolvconf': ensure => absent }
+        service { 'networking':
+          enable => false,
+        }
+
+      }
+      default: {}
+    }
+
+    service { 'systemd-networkd':
+      enable => true,
+    }
+
+    file { '/etc/systemd/network':
+      ensure    => directory,
+    }
+}

manifests/systemd_networkd_interface.pp → manifests/systemd_networkd/interface.pp

-define lysnetwork::systemd_networkd_interface (
+define lysnetwork::systemd_networkd::interface (
   String $interface = $name,
   Array[String] $addresses = [],
   Array[String] $gateways = [],
 ){
+  include lysnetwork::systemd_networkd::base
+
   $content = {
     'Match'   => { 'Name' => $interface },
     'Network' => {