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

[chef.git] / roles / aws.rb

diff --git a/roles/aws.rb b/roles/aws.rb
index ae3225f729e9f449c693c1d853f01d29d1d25888..4438781614f24736efdabf96e10afd4f38b05636 100644 (file)
--- a/roles/aws.rb
+++ b/roles/aws.rb
@@ -1,32 +1,12 @@
 name "aws"
-description "Role applied to all servers on AWS"
+description "Role applied to all servers at AWS"
 
 default_attributes(
-  :networking => {
-    :nameservers => ["172.31.0.2"],
-    :roles => {
-      :internal => {
-        :inet => {
-          :prefix => "20",
-          :gateway => "172.31.0.1"
-        }
-      },
-      :external => {
-        :zone => "aws",
-        :inet => {
-          :prefix => "32"
-        }
-      }
-    }
-  }
+  :hosted_by => "AWS"
 )
 
 override_attributes(
   :ntp => {
-    :servers => ["0.ie.pool.ntp.org", "1.ie.pool.ntp.org", "europe.pool.ntp.org"]
+    :servers => ["169.254.169.123"]
   }
 )
-
-run_list(
-  "role[ie]"
-)