Merge interface families

[chef.git] / roles / viserion.rb

diff --git a/roles/viserion.rb b/roles/viserion.rb
index ab677467d68a6b30c2cb66a248ac4a2d5590533b..0b343f6910372f03c7337277a4944e309db8080e 100644 (file)
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -2,34 +2,32 @@ name "viserion"
 description "Master role applied to viserion"
 
 default_attributes(
 description "Master role applied to viserion"
 
 default_attributes(

+  :accounts => {
+    :users => {
+      :anovak => { :status => :administrator }
+    }
+  },
+  :location => "Pula, Croatia",
+  :munin => {
+    :allow => ["193.198.233.210"]
+  },

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
+      :external => {

         :interface => "eth0",
         :role => :external,
         :interface => "eth0",
         :role => :external,

-        :family => :inet,
-        :address => "193.198.233.211",
-        :prefix => "27",
-        :gateway => "193.198.233.209"
-      },
-      :external_ipv6 => {
-        :interface => "eth0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:b68:4cff:3::3",
-        :prefix => "128",
-        :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"
+        }

       }
     }
       }
     }

-  },
-  :squid => {
-    :cache_mem => "12500 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 => [
-    ]

   }
 )
 
   }
 )