Merge remote-tracking branch 'github/pull/472'

[chef.git] / roles / viserion.rb

diff --git a/roles/viserion.rb b/roles/viserion.rb
index 8686fbfba230a981ad24093691dafe749670e505..a951929020dd9fddc68178d7182afdf5c1739264 100644 (file)
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -7,6 +7,7 @@ default_attributes(
       :anovak => { :status => :administrator }
     }
   },
       :anovak => { :status => :administrator }
     }
   },

+  :location => "Pula, Croatia",

   :munin => {
     :allow => ["193.198.233.210"]
   },
   :munin => {
     :allow => ["193.198.233.210"]
   },


@@ -17,7 +18,7 @@ default_attributes(
         :role => :external,
         :family => :inet,
         :address => "193.198.233.211",
         :role => :external,
         :family => :inet,
         :address => "193.198.233.211",

-        :prefix => "27",
+        :prefix => "29",

         :gateway => "193.198.233.209"
       },
       :external_ipv6 => {
         :gateway => "193.198.233.209"
       },
       :external_ipv6 => {


@@ -28,27 +29,10 @@ default_attributes(
         :prefix => "64",
         :gateway => "2001:b68:4cff:3::1"
       }
         :prefix => "64",
         :gateway => "2001:b68:4cff:3::1"
       }

-    },
-    :nameservers => [
-      "161.53.2.66",
-      "2001:b68:ff:1::2",
-      "2001:b68:ff:2::2",
-      "2001:4860:4860::8888"
-    ]
-  },
-  :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 => [
-      "drogon.openstreetmap.org"
-    ]
+    }

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[carnet]",
-  "role[tilecache]"
+  "role[carnet]"

 )
 )