Merge pull request #8 from jordiprats/master

 	domain empty str

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.1.21
+
+* dont add domain when is set to an empty string
+
 ## 0.1.20
 
 * added Ubuntu 16.04 support

manifests/init.pp

@@ -1,7 +1,7 @@
 class resolvconf (
                     $resolvers        = [ '8.8.8.8', '8.8.4.4' ],
                     $domain           = undef,
-                    $searchlist       = undef ,
+                    $searchlist       = undef,
                     $rotate           = true,
                     $timeout          = '1',
                     $attempts         = '1',

metadata.json

@@ -1,14 +1,14 @@
 {
   "name": "eyp-resolvconf",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "author": "eyp",
   "summary": "manages /etc/resolv.conf file",
   "license": "Apache-2.0",
-  "source": "",
-  "project_page": "http://systemadmin.es",
-  "issues_url": null,
+  "source": "https://github.com/NTTCom-MS/eyp-resolvconf",
+  "project_page": "https://github.com/NTTCom-MS/eyp-resolvconf",
+  "issues_url": "https://github.com/NTTCom-MS/eyp-resolvconf/issuesq",
   "dependencies": [
-    {"version_requirement":">= 1.0.0","name":"puppetlabs/stdlib"}
+    {"version_requirement":">= 1.0.0 < 9.9.9","name":"puppetlabs/stdlib"}
   ],
   "operatingsystem_support": [
     {
@@ -35,5 +35,11 @@
       "operatingsystem": "SLES",
       "operatingsystemrelease": [ "11.3" ]
     }
+  ],
+  "requirements": [
+    {
+      "name": "puppet",
+      "version_requirement": ">= 3.8.0"
+    }
   ]
 }

spec/acceptance/nodesets/centos5-docker.yml

@@ -5,7 +5,7 @@ HOSTS:
       strict_variables:
     platform: el-5-x86_64
     hypervisor : docker
-    image: tianon/centos:5.10
+    image: jordiprats/centos5:5.11
     docker_preserve_image: true
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:

templates/resolvconf.erb

@@ -1,13 +1,15 @@
 #
-#     DO NOT EDIT THIS FILE -- YOUR CHANGES WILL BE AUTOMATICALLY OVERWRITTEN 
+#     DO NOT EDIT THIS FILE -- YOUR CHANGES WILL BE AUTOMATICALLY OVERWRITTEN
 #
 # puppet managed file
 #
 <% @resolvers.each do |val| -%>
 nameserver <%= val %>
 <% end -%>
 <% if defined?(@domain) -%>
-domain <%= scope.lookupvar('resolvconf::domain') %>
+  <%- if @domain != "" -%>
+domain <%= @domain %>
+  <%- end -%>
 <% end -%>
 <% if defined?(@searchlist) -%>
 <% if @searchlist.kind_of?(Array) -%>