Simplify firewall zones

[chef.git] / roles / aws.rb

diff --git a/roles/aws.rb b/roles/aws.rb
index ae3225f729e9f449c693c1d853f01d29d1d25888..d4ad3fd0f3aa7e57826a26b564c568bf83070962 100644 (file)
--- a/roles/aws.rb
+++ b/roles/aws.rb
@@ -2,6 +2,8 @@ name "aws"
 description "Role applied to all servers on AWS"
 
 default_attributes(
+  :hosted_by => "AWS",
+  :location => "Ireland",
   :networking => {
     :nameservers => ["172.31.0.2"],
     :roles => {
@@ -12,7 +14,6 @@ default_attributes(
         }
       },
       :external => {
-        :zone => "aws",
         :inet => {
           :prefix => "32"
         }