Merge pull request #2 from jordiprats/master

bugfix varis

CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 0.1.3
+
+* bugfix: search option implementation
+
+## 0.1.2
+
+* bugfix yaml syntax
+
+## 0.1.1
+
+* **netplan::interface**:
+  - filename option
+  - added **search** option to configure search domains
+
 ## 0.1.0
 
 * initial release

examples/defaultDNS.pp

@@ -0,0 +1,7 @@
+netplan::interface { 'all':
+  dev        => 'resolversallinterfaces',
+  match      => true,
+  match_name => '*',
+  dns        => [ '1.1.1.1', '8.8.8.8' ],
+  search     => [ 'demo.vm', 'demo2.vm' ],
+}

manifests/init.pp

@@ -8,6 +8,9 @@
                 $netplan_dir_purge     = false,
               ) inherits netplan::params{
 
+  include ::systemd::resolved
+
+  Class['::systemd::resolved'] ->
   class { '::netplan::install': }
   -> class { '::netplan::config': }
   -> Class['::netplan']

manifests/interface.pp

@@ -1,5 +1,6 @@
 define netplan::interface (
                             $dev              = $name,
+                            $filename         = $name,
                             $match            = false,
                             $match_name       = undef,
                             $match_macaddress = undef,
@@ -8,6 +9,7 @@
                             $gateway4         = undef,
                             $gateway6         = undef,
                             $dns              = [],
+                            $search           = [],
                             $dhcp4            = undef,
                             $dhcp6            = undef,
                             $optional         = undef,
@@ -16,7 +18,7 @@
                           ) {
   include ::netplan
 
-  file { "/etc/netplan/${order}-${dev}.yaml":
+  file { "/etc/netplan/${order}-${filename}.yaml":
     ensure  => 'present',
     owner   => 'root',
     group   => 'root',

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "eyp-netplan",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "author": "eyp",
   "summary": "network management using netplan.io",
   "license": "Apache-2.0",
@@ -10,6 +10,7 @@
   "dependencies": [
     {"name":"puppetlabs/stdlib","version_requirement":">= 1.0.0 < 9.9.9"},
     {"name":"puppetlabs/concat","version_requirement":">= 1.2.3 < 3.0.0"},
+    {"name":"eyp/systemd","version_requirement":">= 0.1.43 < 0.2.0"},
     {"name":"eyp/eyplib","version_requirement":">= 0.1.0 < 0.2.0"}
   ],
   "operatingsystem_support": [

templates/interface.erb

@@ -3,11 +3,11 @@
 network:
   version: 2
   ethernets:
-    <%= @dev %>:
+    '<%= @dev %>':
       <%- if @match -%>
       match:
         <%- if defined?(@match_name) -%>
-        name: <%= @match_name %>
+        name: '<%= @match_name %>'
         <%- end -%>
         <%- if defined?(@match_macaddress) -%>
         macaddress: <%= @match_macaddress %>
@@ -37,6 +37,9 @@ network:
       <%- if @dns.any? -%>
       nameservers:
         addresses: [<%= @dns.join(',') %>]
+        <%- if @search.any? -%>
+        search: [<%= @search.join(',') %>]
+        <%- end -%>
       <%- end -%>
       <%- if defined?(@macaddress) -%>
       macaddress: <%= @macaddress %>