Fix OTRS test failures

[chef.git] / roles / paulla.rb

diff --git a/roles/paulla.rb b/roles/paulla.rb
index cc128c4777e97218fb369b1aaae0c7354cc8c65c..516546968c35a112d77e8ae2ef41a2206efeb0bf 100644 (file)
--- a/roles/paulla.rb
+++ b/roles/paulla.rb
@@ -8,20 +8,17 @@ default_attributes(
       :jpcw => { :status => :administrator }
     }
   },
       :jpcw => { :status => :administrator }
     }
   },

+  :hosted_by => "Université de Pau et des Pays de l'Adour",
+  :location => "Pau, France",

   :munin => {
     :allow => ["10.64.1.11"]
   :munin => {
     :allow => ["10.64.1.11"]

-  },
-  :networking => {
-    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"],
-    :roles => {
-      :external => {
-        :zone => "pa"
-      }
-    }

   }
 )
 
 override_attributes(
   }
 )
 
 override_attributes(

+  :networking => {
+    :nameservers => ["10.64.1.42", "194.167.156.13", "10.64.1.3"]
+  },

   :ntp => {
     :servers => ["cannelle.paulla.asso.fr"]
   }
   :ntp => {
     :servers => ["cannelle.paulla.asso.fr"]
   }