Bump cookstyle from 7.25.8 to 7.25.9

[chef.git] / roles / lockheed.rb

diff --git a/roles/lockheed.rb b/roles/lockheed.rb
index 175b81243d0984a2559c4ede3c01b8e59b3138af..6fc5cc7dfbc1c2ae508c0e3fb4815f1d70f0e25a 100644 (file)
--- a/roles/lockheed.rb
+++ b/roles/lockheed.rb
@@ -2,46 +2,35 @@ name "lockheed"
 description "Master role applied to lockheed"
 
 default_attributes(
 description "Master role applied to lockheed"
 
 default_attributes(

-  :hardware => {
-    :shm_size => "12g"
-  },
-  :location => "Falkenstein, Germany",

   :networking => {
     :interfaces => {
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.48.16",
+        :bond => {
+          :slaves => %w[eth0 eth1]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "ens13",
+        :interface => "bond0.2",

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

-        :address => "176.9.171.103",
-        :prefix => "28",
-        :gateway => "176.9.171.97"
+        :address => "130.117.76.16"

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

-        :interface => "ens13",
+        :interface => "bond0.2",

         :role => :external,
         :family => :inet6,
         :role => :external,
         :family => :inet6,

-        :address => "2a01:4f8:13a:209::103",
-        :prefix => "64",
-        :gateway => "2a01:4f8:13a:209::3"
+        :address => "2001:978:2:2C::172:10"

       }
       }

+

     }
     }

-  },
-  :squid => {
-    :version => 4,
-    :cache_mem => "8192 MB",
-    :cache_dir => [
-      "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996",
-      "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092",
-      "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284",
-      "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144"
-    ]
-  },
-  :tilecache => {
-    :tile_parent => "germany.render.openstreetmap.org"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[hetzner]",
-  "role[tilecache]"
+  "role[equinix-ams]",
+  "role[community]"

 )
 )