Upgrade ridley and ouroboros to chef 12

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 2fc170b801d258453d0acbaedd6d094ad931c2b2..5cb43e807d2376cec48bac71f1c395049fe46046 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -25,18 +25,18 @@ require "ipaddr"
 node[:networking][:interfaces].each do |name, interface|
   if interface[:role] && role = node[:networking][:roles][interface[:role]]
     if role[interface[:family]]
 node[:networking][:interfaces].each do |name, interface|
   if interface[:role] && role = node[:networking][:roles][interface[:role]]
     if role[interface[:family]]

-      node.default[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
-      node.default[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]
+      node.set[:networking][:interfaces][name][:prefix] = role[interface[:family]][:prefix]
+      node.set[:networking][:interfaces][name][:gateway] = role[interface[:family]][:gateway]

     end
 
     end
 

-    node.default[:networking][:interfaces][name][:metric] = role[:metric]
-    node.default[:networking][:interfaces][name][:zone] = role[:zone]
+    node.set[:networking][:interfaces][name][:metric] = role[:metric]
+    node.set[:networking][:interfaces][name][:zone] = role[:zone]

   end
 
   prefix = node[:networking][:interfaces][name][:prefix]
 
   end
 
   prefix = node[:networking][:interfaces][name][:prefix]
 

-  node.default[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
-  node.default[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)
+  node.set[:networking][:interfaces][name][:netmask] = (~IPAddr.new(interface[:address]).mask(0)).mask(prefix)
+  node.set[:networking][:interfaces][name][:network] = IPAddr.new(interface[:address]).mask(prefix)

 end
 
 template "/etc/network/interfaces" do
 end
 
 template "/etc/network/interfaces" do

diff --git a/roles/ouroboros.rb b/roles/ouroboros.rb
index d1d5d727118e48b6d3850d1cd7ef295c4b630812..0895ff5b16f3528c6a0157f409296587876a3bbc 100644 (file)
--- a/roles/ouroboros.rb
+++ b/roles/ouroboros.rb
@@ -2,11 +2,6 @@ name "ouroboros"
 description "Master role applied to ouroboros"
 
 default_attributes(
 description "Master role applied to ouroboros"
 
 default_attributes(

-  :chef => {
-    :client => {
-      :version => "11.18.0-1"
-    }
-  },

   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 7637af87dc34394839fd89a6ab87adbd6b05b681..efcdd4c7dae67bd72b183e9358a6babadb07ad12 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -8,11 +8,6 @@ default_attributes(
       :certificate_chain => "startcom"
     }
   },
       :certificate_chain => "startcom"
     }
   },

-  :chef => {
-    :client => {
-      :version => "11.18.0-1"
-    }
-  },

   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"