Remove some redundant settings from chef server configuration

[chef.git] / roles / fume.rb

diff --git a/roles/fume.rb b/roles/fume.rb
index a023e8a04fb0c6d7958442cdfb0b7dcc8c94fd88..6af2333b4d6de6ef766451a3a56843c001eacd31 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -4,32 +4,35 @@ description "Master role applied to fume"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
-        :interface => "ens3",
+      :internal => {
+        :interface => "bond0",
+        :role => :internal,
+        :inet => {
+          :address => "10.0.64.16"
+        },
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno5 eno6]
+        }
+      },
+      :external => {
+        :interface => "bond0.101",
         :role => :external,
-        :family => :inet,
-        :address => "147.228.60.16",
-        :prefix => "24",
-        :gateway => "147.228.60.1"
+        :inet => {
+          :address => "184.104.226.112"
+        },
+        :inet6 => {
+          :address => "2001:470:1:b3b::10"
+        }
       }
     }
-  },
-  :squid => {
-    :cache_mem => "4096 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "pilsen.render.openstreetmap.org",
-    :tile_siblings => [
-      "sarkany.openstreetmap.org",
-      "chrysophylax.openstreetmap.org",
-      "drogon.openstreetmap.org",
-      "viserion.openstreetmap.org"
-    ]
   }
 )
 
 run_list(
-  "role[zcu]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[blog-staging]",
+  "role[birthday20]"
 )