Upgrade ridley and ouroboros to chef 12

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 04df2495f43b1847314a65ffe9d37927f90fcaad..5cb43e807d2376cec48bac71f1c395049fe46046 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -22,21 +22,21 @@
 
 require "ipaddr"
 
 
 require "ipaddr"
 

-node[:networking][:interfaces].each do |name,interface|
-  if interface[:role] and role = node[:networking][:roles][interface[:role]]
+node[:networking][:interfaces].each do |name, interface|
+  if interface[:role] && role = node[:networking][:roles][interface[:role]]

     if role[interface[:family]]
     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


@@ -81,26 +81,26 @@ template "/etc/resolv.conf" do
 end
 
 node.interfaces(:role => :internal) do |interface|
 end
 
 node.interfaces(:role => :internal) do |interface|

-  if interface[:gateway] and interface[:gateway] != interface[:address]
+  if interface[:gateway] && interface[:gateway] != interface[:address]

     search(:node, "networking_interfaces*address:#{interface[:gateway]}") do |gateway|
     search(:node, "networking_interfaces*address:#{interface[:gateway]}") do |gateway|

-      if gateway[:openvpn]
-        gateway[:openvpn][:tunnels].each_value do |tunnel|
-          if tunnel[:peer][:address]
-            route tunnel[:peer][:address] do
-              netmask "255.255.255.255"
-              gateway interface[:gateway]
-              device interface[:interface]
-            end
+      next unless gateway[:openvpn]
+
+      gateway[:openvpn][:tunnels].each_value do |tunnel|
+        if tunnel[:peer][:address] # ~FC023
+          route tunnel[:peer][:address] do
+            netmask "255.255.255.255"
+            gateway interface[:gateway]
+            device interface[:interface]

           end
           end

+        end
+
+        next unless tunnel[:peer][:networks]

 
 

-          if tunnel[:peer][:networks]
-            tunnel[:peer][:networks].each do |network|
-              route network[:address] do
-                netmask network[:netmask]
-                gateway interface[:gateway]
-                device interface[:interface]
-              end
-            end
+        tunnel[:peer][:networks].each do |network|
+          route network[:address] do
+            netmask network[:netmask]
+            gateway interface[:gateway]
+            device interface[:interface]

           end
         end
       end
           end
         end
       end


@@ -108,24 +108,24 @@ node.interfaces(:role => :internal) do |interface|
   end
 end
 
   end
 end
 

-zones = Hash.new
+zones = {}

 
 search(:node, "networking:interfaces").collect do |n|
 
 search(:node, "networking:interfaces").collect do |n|

-  if n[:fqdn] != node[:fqdn]
-    n.interfaces.each do |interface|
-      if interface[:role] == "external" and interface[:zone]
-        zones[interface[:zone]] ||= Hash.new
-        zones[interface[:zone]][interface[:family]] ||= Array.new
-        zones[interface[:zone]][interface[:family]] << interface[:address]
-      end
-    end
+  next if n[:fqdn] == node[:fqdn]
+
+  n.interfaces.each do |interface|
+    next unless interface[:role] == "external" && interface[:zone]
+
+    zones[interface[:zone]] ||= {}
+    zones[interface[:zone]][interface[:family]] ||= []
+    zones[interface[:zone]][interface[:family]] << interface[:address]

   end
 end
 
 package "shorewall"
 
 service "shorewall" do
   end
 end
 
 package "shorewall"
 
 service "shorewall" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :restart => true
   status_command "shorewall status"
 end
   supports :restart => true
   status_command "shorewall status"
 end


@@ -199,7 +199,7 @@ firewall_rule "limit-icmp-echo" do
   rate_limit "s:1/sec:5"
 end
 
   rate_limit "s:1/sec:5"
 end
 

-[ "ucl", "ic", "bm" ].each do |zone|
+%w(ucl ic bm).each do |zone|

   firewall_rule "accept-openvpn-#{zone}" do
     action :accept
     family :inet
   firewall_rule "accept-openvpn-#{zone}" do
     action :accept
     family :inet


@@ -226,11 +226,11 @@ else
   end
 end
 
   end
 end
 

-if not node.interfaces(:family => :inet6).empty?
+unless node.interfaces(:family => :inet6).empty?

   package "shorewall6"
 
   service "shorewall6" do
   package "shorewall6"
 
   service "shorewall6" do

-    action [ :enable, :start ]
+    action [:enable, :start]

     supports :restart => true
     status_command "shorewall6 status"
   end
     supports :restart => true
     status_command "shorewall6 status"
   end