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

[chef.git] / roles / ladon.rb

diff --git a/roles/ladon.rb b/roles/ladon.rb
index d6441143144887c034ee7da8603d993662172ad6..014319f2b57eb35a0656fe3503001226df194bcf 100644 (file)
--- a/roles/ladon.rb
+++ b/roles/ladon.rb
@@ -3,7 +3,6 @@ description "Master role applied to ladon"
 
 default_attributes(
   :networking => {
 
 default_attributes(
   :networking => {

-    :netplan => true,

     :interfaces => {
       :external_ipv4 => {
         :interface => "bond0",
     :interfaces => {
       :external_ipv4 => {
         :interface => "bond0",


@@ -16,7 +15,7 @@ default_attributes(
           :mode => "802.3ad",
           :miimon => "100",
           :xmithashpolicy => "layer3+4",
           :mode => "802.3ad",
           :miimon => "100",
           :xmithashpolicy => "layer3+4",

-          :slaves => %w[eth0 eth1]
+          :slaves => %w[ens1f0 ens1f1]

         }
       },
       :external_ipv6 => {
         }
       },
       :external_ipv6 => {


@@ -28,24 +27,9 @@ default_attributes(
         :gateway => "2001:648:2ffe:4::1"
       }
     }
         :gateway => "2001:648:2ffe:4::1"
       }
     }

-  },
-  :squid => {
-    :cache_mem => "6100 MB",
-    :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "athens.render.openstreetmap.org",
-    :tile_siblings => [
-      "trogdor.openstreetmap.org",
-      "katie.openstreetmap.org",
-      "konqi.openstreetmap.org",
-      "ridgeback.openstreetmap.org",
-      "gorynych.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

 )
 )