Avoid including Chef::Mixin::ShellOut in resources

[chef.git] / roles / rimfaxe.rb

diff --git a/roles/rimfaxe.rb b/roles/rimfaxe.rb
index 8d58ea2014e72e1c49489bf240fa20bfee9a2073..1b6b34cfbf02249543c92f47b5289cddb03bd37e 100644 (file)
--- a/roles/rimfaxe.rb
+++ b/roles/rimfaxe.rb
@@ -11,6 +11,14 @@ default_attributes(
         :address => "130.225.254.109",
         :prefix => "27",
         :gateway => "130.225.254.97"
         :address => "130.225.254.109",
         :prefix => "27",
         :gateway => "130.225.254.97"

+      },
+      :external_ipv6 => {
+        :interface => "eth0",
+        :role => :external,
+        :family => :inet6,
+        :address => "2001:878:346::109",
+        :prefix => "64",
+        :gateway => "2001:878:346::97"

       }
     }
   },
       }
     }
   },


@@ -21,7 +29,6 @@ default_attributes(
   :tilecache => {
     :tile_parent => "aalborg.render.openstreetmap.org",
     :tile_siblings => [
   :tilecache => {
     :tile_parent => "aalborg.render.openstreetmap.org",
     :tile_siblings => [

-      "trogdor.openstreetmap.org",

       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",
       "katie.openstreetmap.org",
       "konqi.openstreetmap.org",
       "ridgeback.openstreetmap.org",