fix rubocop offenses

[chef.git] / roles / ascalon.rb

diff --git a/roles/ascalon.rb b/roles/ascalon.rb
index 4cf1d2c2471d455dad8e3cdee5a425fe453eea66..1e9a9e4a150f57fe2f8816dd6f385cf3a3d6edc5 100644 (file)
--- a/roles/ascalon.rb
+++ b/roles/ascalon.rb
@@ -4,29 +4,31 @@ description "Master role applied to ascalon"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :internal_ipv4 => {
-        :interface => "eth1",
-        :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.18"
-      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "eth1.2800",
+        :interface => "eno1",

         :role => :external,
         :family => :inet,
         :role => :external,
         :family => :inet,

-        :address => "193.60.236.10"
+        :address => "184.107.48.228",
+        :prefix => "27",
+        :gateway => "184.107.48.225"

       }
     }
   },
       }
     }
   },

-  :accounts => {
-    :users => {
-      :emacsen => { :status => :administrator }
-    }
+  :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[ucl-slough]",
-  "role[hp-g5]",
-  "role[roundup]"
+  "role[netalerts]",
+  "role[geodns]",
+  "role[tilecache]"

 )
 )