Merge interface families

[chef.git] / roles / viserion.rb

diff --git a/roles/viserion.rb b/roles/viserion.rb
index 2bd3ec5e4e9605279b5f011203994668310a4d54..0b343f6910372f03c7337277a4944e309db8080e 100644 (file)
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -13,43 +13,24 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "eth0",
         :role => :external,
-        :family => :inet,
-        :address => "193.198.233.211",
-        :prefix => "29",
-        :gateway => "193.198.233.209"
-      },
-      :external_ipv6 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:b68:4cff:3::3",
-        :prefix => "64",
-        :gateway => "2001:b68:4cff:3::1"
+        :inet => {
+          :address => "193.198.233.211",
+          :prefix => "29",
+          :gateway => "193.198.233.209"
+        },
+        :inet6 => {
+          :address => "2001:b68:4cff:3::3",
+          :prefix => "64",
+          :gateway => "2001:b68:4cff:3::1"
+        }
       }
-    },
-    :nameservers => [
-      "8.8.8.8",
-      "8.8.4.4",
-      "2001:4860:4860::8888",
-      "2001:4860:4860::8844"
-    ]
-  },
-  :squid => {
-    :cache_mem => "32000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "pula.render.openstreetmap.org",
-    :tile_siblings => [
-      "drogon.openstreetmap.org"
-    ]
+    }
   }
 )
 
 run_list(
-  "role[carnet]",
-  "role[tilecache]"
+  "role[carnet]"
 )