adapt to chef11

metadata.rb

@@ -3,5 +3,5 @@ maintainer_email "hpc@gsi.de"
 license          "All rights reserved"
 description      "Installs/Configures fai"
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          "0.2.3"
+version          "0.3.0"
 depends          "nfs"

recipes/default.rb

@@ -28,11 +28,11 @@ if node.fai.configdir
   end
     
   node[:fai][:clients].each do |client|
-    node[:nfs][:exports] << "#{node[:fai][:configdir]} #{client}(ro,async,subtree_check)"
+    node.default[:nfs][:exports] = ["#{node[:fai][:configdir]} #{client}(ro,async,subtree_check)"]
   end
 
   node[:fai][:insecure_clients].each do |insecure_client|
-    node[:nfs][:exports] << "#{node[:fai][:configdir]} #{insecure_client}(ro,async,subtree_check,insecure)"
+    node.default[:nfs][:exports] = ["#{node[:fai][:configdir]} #{insecure_client}(ro,async,subtree_check,insecure)"]
   end
 end
 
@@ -128,9 +128,9 @@ if node.fai.setup_default
 end
 
 node[:fai][:clients].each do |client|
-  node[:nfs][:exports] << "/srv/fai/nfsroot #{client}(ro,no_root_squash,async,subtree_check)"
+  node.default[:nfs][:exports] = ["/srv/fai/nfsroot #{client}(ro,no_root_squash,async,subtree_check)"]
 end
 
 node[:fai][:insecure_clients].each do |insecure_client|
-  node[:nfs][:exports] << "/srv/fai/nfsroot #{insecure_client}(ro,async,subtree_check,insecure)"
+  node.default[:nfs][:exports] = ["/srv/fai/nfsroot #{insecure_client}(ro,async,subtree_check,insecure)"]
 end

recipes/flavors.rb

@@ -104,7 +104,7 @@ node.fai.flavors.each do |f, pkgs|
   end
 
   node[:fai][:clients].each do |client|
-    node[:nfs][:exports] << "#{nfs_dir} #{client}(ro,no_root_squash,async,subtree_check)"
+    node.default[:nfs][:exports] = ["#{nfs_dir} #{client}(ro,no_root_squash,async,subtree_check)"]
   end
 
 end

templates/default/make-fai-nfsroot.conf.erb

@@ -2,7 +2,7 @@
 NFSROOT=<%= @nfsdir %>
 TFTPROOT=<%= @tftpdir || '/srv/tftp/fai' %> 
 FAI_CONFIGDIR=<%= @config_src %>
-NFSROOT_ETC_HOSTS="<%= node.ipaddress node.fqdn %>"
+NFSROOT_ETC_HOSTS="<%= node[:ipaddress] %> <%= node[:fqdn] %>"
 FAI_DEBOOTSTRAP="<%= "#{@codename} #{node.fai.debmirror_url}" %>"
 <% if node.fai.root_pw_hash %>
 FAI_ROOTPW='<%= node.fai.root_pw_hash %>'