Shorten shorewall zone name

diff --git a/cookbooks/networking/templates/default/shorewall-zones.erb b/cookbooks/networking/templates/default/shorewall-zones.erb
index 048d5ae76d96142424a9ca154b4ee4e8d2d50c2f..2de26df69d0fe1508a8c340d4c5f00f6f70275cd 100644 (file)
--- a/cookbooks/networking/templates/default/shorewall-zones.erb
+++ b/cookbooks/networking/templates/default/shorewall-zones.erb
@@ -21,4 +21,4 @@ hz:osm                <%= @type %>
 bh:osm         <%= @type %>
 dt:osm         <%= @type %>
 nc:osm         <%= @type %>
 bh:osm         <%= @type %>
 dt:osm         <%= @type %>
 nc:osm         <%= @type %>

-osuosl:osm     <%= @type %>
+ool:osm                <%= @type %>

diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index 285c82952284d59f52fb241e50a8b2e39f53d9c4..38fcb7e81f2ebb6a0f7a4067e84ded3c4315c0e6 100644 (file)
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -12,7 +12,7 @@ default_attributes(
         }
       },
       :external => {
         }
       },
       :external => {

-        :zone => "osuosl"
+        :zone => "ool"

       }
     }
   }
       }
     }
   }