Merge pull request #16 from twc-openstack/puppet4-fixes

Puppet 4 fixes

Author: tedivm

manifests/backup.pp

@@ -9,7 +9,8 @@
     host        => $host,
     server      => $::rsnapshot::client::server,
     client_user => $::rsnapshot::client::client_user,
-    options     => $options
+    options     => $options,
+    config_file => undef,
   }
 
 }

templates/config.erb

@@ -33,7 +33,7 @@ snapshot_root	<%= @snapshot_root %>/
 #################################
 
 <% @programs.each do |program,directory| -%>
-  <%- if directory.to_s != 'undef' -%>
+  <%- if directory and directory.to_s != 'undef' -%>
 <%= program %>	<%= directory %>
   <%- end -%>
 <% end -%>
@@ -43,7 +43,7 @@ snapshot_root	<%= @snapshot_root %>/
 ###########
 
 <% @options.each do |option,value| -%>
-  <%- if value.to_s != 'undef' -%>
+  <%- if value and value.to_s != 'undef' -%>
 <%= option %>	<%= value %>
   <%- end -%>
 <% end -%>