Expire tiles from both osm.gz and osc.gz files

[chef.git] / roles / draco.rb

diff --git a/roles/draco.rb b/roles/draco.rb
index 770d8fc968a0e929652ee0655eb3e55461698a04..dc28adf567738305f74190306875332347eb7c7c 100644 (file)
--- a/roles/draco.rb
+++ b/roles/draco.rb
@@ -2,29 +2,26 @@ name "draco"
 description "Master role applied to draco"
 
 default_attributes(
-  :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
-  },
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "eth0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.11"
       },
       :external_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth0.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.195"
+        :address => "193.60.236.12"
       }
     }
   },
   :sysctl => {
     :tune_cpu_scheduler => {
       :comment => "Tune CPU scheduler for server scheduling",
-      :parameters => { 
+      :parameters => {
         "kernel.sched_migration_cost" => 50000000,
         "kernel.sched_autogroup_enabled" => 0
       }
@@ -33,5 +30,6 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]"
+  "role[ucl]",
+  "role[hp-g5]"
 )