Add host name to munin email subject

[chef.git] / roles / ucl-wolfson.rb

diff --git a/roles/ucl-wolfson.rb b/roles/ucl-wolfson.rb
index 882621d0d7f77f6ac9c2c34f5aee0f6e94396d94..208185a37182d91af2223031e5a7bfc8e58ef265 100644 (file)
--- a/roles/ucl-wolfson.rb
+++ b/roles/ucl-wolfson.rb
@@ -4,6 +4,12 @@ description "Role applied to all servers at UCL which are in Wolfson House"
 default_attributes(
   :networking => {
     :roles => {
+      :internal => {
+        :inet => {
+          :prefix => "20",
+          :gateway => "10.0.0.3"
+        }
+      },
       :external => {
         :zone => "ucl",
         :inet => {
@@ -17,8 +23,8 @@ default_attributes(
 
 override_attributes(
   :networking => {
-    :nameservers => [ "8.8.8.8", "8.8.4.4" ],
-    :search => [ "openstreetmap.org" ]
+    :nameservers => ["10.0.0.3", "8.8.8.8", "8.8.4.4"],
+    :search => ["ucl.openstreetmap.org", "openstreetmap.org"]
   }
 )