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

[chef.git] / roles / equinix.rb

diff --git a/roles/equinix.rb b/roles/equinix.rb
index a98450b343d0f273fd86c2affdb6b742517b5469..e04f7fac5b253da09567e58567cda0af6757cf2d 100644 (file)
--- a/roles/equinix.rb
+++ b/roles/equinix.rb
@@ -3,7 +3,6 @@ description "Role applied to all servers at Equinix"
 
 default_attributes(
   :networking => {
-    :nameservers => ["66.28.0.45", "66.28.0.61"],
     :roles => {
       :internal => {
         :inet => {
@@ -42,6 +41,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
+    :nameservers => ["66.28.0.45", "66.28.0.61"],
     :search => ["ams.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
@@ -50,6 +50,5 @@ override_attributes(
 )
 
 run_list(
-  "role[nl]",
-  "recipe[prometheus]"
+  "role[nl]"
 )