Update interface list for remaining G9s in Dublin

[chef.git] / roles / scorch.rb

diff --git a/roles/scorch.rb b/roles/scorch.rb
index be1e75c8c01c902d34deeeb1053bd5de7cd8a151..876fb6905f4d8c4016b3040f00c14eb0c75a034a 100644 (file)
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -2,9 +2,6 @@ name "scorch"
 description "Master role applied to scorch"
 
 default_attributes(
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :devices => {
     :ssd_system => {
       :comment => "Tune scheduler for system disk",
@@ -16,17 +13,11 @@ default_attributes(
         "queue/nr_requests" => "256",
         "queue/read_ahead_kb" => "2048"
       }
-    },
-    :ssd_database => {
-      :comment => "Tune scheduler for database disk",
-      :type => "block",
-      :bus => "scsi",
-      :serial => "3600605b009bbf5601fd931c6dfac767f",
-      :attrs => {
-        "queue/scheduler" => "noop",
-        "queue/nr_requests" => "256",
-        "queue/read_ahead_kb" => "2048"
-      }
+    }
+  },
+  :hardware => {
+    :mcelog => {
+      :enabled => false
     }
   },
   :networking => {
@@ -43,14 +34,13 @@ default_attributes(
         :interface => "eth0",
         :role => :external,
         :family => :inet6,
-        :address => "2001:41d0:2:fc4f::",
+        :address => "2001:41d0:2:fc4f::1",
         :prefix => "64",
-        :gateway => "fe80::12bd:18ff:fee5:2280"
+        :gateway => "2001:41d0:2:fcff:ff:ff:ff:ff"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -70,9 +60,9 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.5/main"
+      :cluster => "12/main",
+      :postgis => "3"
     },
-    :node_file => "/store/database/nodes",
     :styles => {
       :default => {
         :tile_directories => [