Don't upgrade cgimap automatically

[chef.git] / roles / bytemark.rb

diff --git a/roles/bytemark.rb b/roles/bytemark.rb
index 4e80daa56f7098c42117b95c668ca9159d51bf77..7b06247525ba718d57c0445ac17943cf50424e21 100644 (file)
--- a/roles/bytemark.rb
+++ b/roles/bytemark.rb
@@ -5,7 +5,6 @@ default_attributes(
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {
   :hosted_by => "Bytemark",
   :location => "York, England",
   :networking => {

-    :nameservers => ["10.0.32.20"],

     :roles => {
       :internal => {
         :inet => {
     :roles => {
       :internal => {
         :inet => {


@@ -38,6 +37,7 @@ default_attributes(
 
 override_attributes(
   :networking => {
 
 override_attributes(
   :networking => {

+    :nameservers => ["10.0.32.20"],

     :search => ["bm.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {
     :search => ["bm.openstreetmap.org", "openstreetmap.org"]
   },
   :ntp => {