X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cd11e1f4e54002c87947f4d0a0c5b1795c1f24f4..bb9cec733c3da85e8be2627afdbc09549e8bbf6b:/cookbooks/networking/recipes/default.rb diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb index 2383af7d7..11c75daec 100644 --- a/cookbooks/networking/recipes/default.rb +++ b/cookbooks/networking/recipes/default.rb @@ -69,19 +69,19 @@ node[:networking][:interfaces].each do |name, interface| next unless interface[:role] && (role = node[:networking][:roles][interface[:role]]) if interface[:inet] && role[:inet] - node.default[:networking][:interfaces][name][:inet][:prefix] = role[:inet][:prefix] - node.default[:networking][:interfaces][name][:inet][:gateway] = role[:inet][:gateway] - node.default[:networking][:interfaces][name][:inet][:routes] = role[:inet][:routes] + node.default_unless[:networking][:interfaces][name][:inet][:prefix] = role[:inet][:prefix] + node.default_unless[:networking][:interfaces][name][:inet][:gateway] = role[:inet][:gateway] + node.default_unless[:networking][:interfaces][name][:inet][:routes] = role[:inet][:routes] end if interface[:inet6] && role[:inet6] - node.default[:networking][:interfaces][name][:inet6][:prefix] = role[:inet6][:prefix] - node.default[:networking][:interfaces][name][:inet6][:gateway] = role[:inet6][:gateway] - node.default[:networking][:interfaces][name][:inet6][:routes] = role[:inet6][:routes] + node.default_unless[:networking][:interfaces][name][:inet6][:prefix] = role[:inet6][:prefix] + node.default_unless[:networking][:interfaces][name][:inet6][:gateway] = role[:inet6][:gateway] + node.default_unless[:networking][:interfaces][name][:inet6][:routes] = role[:inet6][:routes] end - node.default[:networking][:interfaces][name][:metric] = role[:metric] - node.default[:networking][:interfaces][name][:zone] = role[:zone] + node.default_unless[:networking][:interfaces][name][:metric] = role[:metric] + node.default_unless[:networking][:interfaces][name][:zone] = role[:zone] end node[:networking][:interfaces].each do |_, interface|