Fix backup expiry script to match prefixes correctly

[chef.git] / roles / ascalon.rb

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

-    :netplan => true,

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


@@ -14,22 +13,9 @@ default_attributes(
         :gateway => "184.107.48.225"
       }
     }
         :gateway => "184.107.48.225"
       }
     }

-  },
-  :squid => {
-    :cache_mem => "16000 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "montreal.render.openstreetmap.org",
-    :tile_siblings => [
-      "stormfly-02.openstreetmap.org",
-      "jakelong.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[netalerts]",
-  "role[geodns]",
-  "role[tilecache]"
+  "role[netalerts]"

 )
 )