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

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 1d499a5b40003078f17b71b5693439eb88c1c672..15433754edc46cbb9314b761ce7d3cdadf703301 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,49 +2,53 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
 description "Master role applied to norbert"
 
 default_attributes(

-  :accounts => {
-    :users => {
-      :yellowbkpk => { :status => :administrator },
-      :pnorman => { :status => :user }
-    }
-  },
-  :exim => {
-    :aliases => {
-      :root => "yellowbkpk"
-    }
+  :hardware => {
+    :shm_size => "12g"

   },
   :networking => {
     :interfaces => {
   },
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
-        :interface => "eth0",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.5"
-      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "eth1.2800",
+        :interface => "ens18",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "193.60.236.17"
+        :address => "89.234.186.100",
+        :prefix => "27",
+        :gateway => "89.234.186.97"
+      },
+      :external_ipv6 => {
+        :interface => "ens18",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a00:5884:821c::1",
+        :prefix => "48",
+        :gateway => "fe80::204:92:100:1"

       }
     }
   },
       }
     }
   },

-  :sysfs => {
-    :hdd_tune => {
-      :comment => "Tune the queue for improved performance",
-      :parameters => {
-        "block/cciss\!c0d0/queue/nr_requests" => "512",
-        "block/cciss\!c0d1/queue/nr_requests" => "512",
-        "block/cciss\!c0d0/queue/scheduler" => "noop",
-        "block/cciss\!c0d1/queue/scheduler" => "noop",
-        "block/sda/queue/nr_requests" => "512",
-        "block/sda/queue/scheduler" => "deadline"
+  :squid => {
+    :version => 4,
+    :cache_mem => "10240 MB",
+    :cache_dir => [
+      "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996",
+      "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
+      "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
+      "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
+    ]
+  },
+  :nginx => {
+    :cache => {
+      :proxy => {
+        :keys_zone => "proxy_cache_zone:64M",
+        :max_size => "2048M"

       }
     }
       }
     }

+  },
+  :tilecache => {
+    :tile_parent => "france.render.openstreetmap.org"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[ucl-slough]",
-  "role[hp-g5]"
+  "role[grifon]",
+  "role[tilecache]"

 )
 )