Merge remote-tracking branch 'github/pull/440'

[chef.git] / cookbooks / networking / templates / default / shorewall-zones.erb

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index ab5ba74287df92af00794bab6570d6487c396677..72e004713582c7b4d9444991cd6a6c552d14ac02 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -4,22 +4,8 @@
 fw             firewall
 loc            <%= @type %>
 net            <%= @type %>
+dock           <%= @type %>
 osm:net                <%= @type %>
 ucl:osm                <%= @type %>
-ic:osm         <%= @type %>
+ams:osm                <%= @type %>
 bm:osm         <%= @type %>
-ts:osm         <%= @type %>
-yx:osm         <%= @type %>
-ra:osm         <%= @type %>
-pa:osm         <%= @type %>
-bx:osm         <%= @type %>
-ff:osm         <%= @type %>
-pr:osm         <%= @type %>
-ly:osm         <%= @type %>
-ov:osm         <%= @type %>
-hz:osm         <%= @type %>
-bh:osm         <%= @type %>
-dt:osm         <%= @type %>
-nc:osm         <%= @type %>
-ool:osm                <%= @type %>
-cnt:osm                <%= @type %>