From e83395675fe4f9b35a1d83e99c50d1ea6fbe79fd Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 29 Mar 2015 14:58:33 +0100 Subject: [PATCH] Upgrade ridley and ouroboros to chef 12 --- cookbooks/networking/recipes/default.rb | 12 ++++++------ roles/ouroboros.rb | 5 ----- roles/ridley.rb | 5 ----- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index 2fc170b80..5cb43e807 100644 --- 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.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 - 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] - 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 diff --git a/roles/ouroboros.rb b/roles/ouroboros.rb index d1d5d7271..0895ff5b1 100644 --- a/roles/ouroboros.rb +++ b/roles/ouroboros.rb @@ -2,11 +2,6 @@ name "ouroboros" description "Master role applied to ouroboros" default_attributes( - :chef => { - :client => { - :version => "11.18.0-1" - } - }, :networking => { :interfaces => { :internal_ipv4 => { diff --git a/roles/ridley.rb b/roles/ridley.rb index 7637af87d..efcdd4c7d 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -8,11 +8,6 @@ default_attributes( :certificate_chain => "startcom" } }, - :chef => { - :client => { - :version => "11.18.0-1" - } - }, :dhcpd => { :first_address => "10.0.15.1", :last_address => "10.0.15.254" -- 2.43.2