On tile caches make admins member of proxy group

[chef.git] / roles / grisu.rb

diff --git a/roles/grisu.rb b/roles/grisu.rb
index dc615033ba212f9d47667695f3ccb6875dd8dd8e..749be40e21faf8d122bc096313da1e11155cd91a 100644 (file)
--- a/roles/grisu.rb
+++ b/roles/grisu.rb
@@ -2,41 +2,33 @@ name "grisu"
 description "Master role applied to grisu"
 
 default_attributes(
-  :accounts => {
-    :users => {
-      :yellowbkpk => { :status => :administrator }
-    }
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "em1",
         :role => :external,
         :family => :inet,
-        :address => "142.4.213.166",
-        :prefix => "24",
-        :gateway => "142.4.213.254"
+        :address => "193.63.75.108",
+        :hwaddress => "d8:d3:85:5d:87:a0"
       },
       :external_ipv6 => {
-        :interface => "eth0",
+        :interface => "em1",
         :role => :external,
         :family => :inet6,
-        :address => "2607:5300:60:12a6::1",
-        :prefix => "64",
-        :gateway => "2607:5300:60:12ff:ff:ff:ff:ff"
+        :address => "2001:630:12:500:dad3:85ff:fe5d:87a0"
+      },
+      :internal_ipv4 => {
+        :interface => "em2",
+        :role => :internal,
+        :family => :inet,
+        :address => "146.179.159.168",
+        :hwaddress => "d8:d3:85:5d:87:a1"
       }
     }
-  },
-  :squid => {
-    :cache_mem => "9000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "beauharnois.render.openstreetmap.org"
   }
 )
 
 run_list(
-  "role[ovh-ca]",
-  "role[tilecache]"
+  "role[ic]",
+  "role[hp-dl180-g6]"
 )