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

[chef.git] / roles / naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index 46f60a66cbc1f4072bed4f12a9c367b3d3904e5f..9710563c472f2d3b3ee760ddf5a8b409ce2bac5b 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -4,40 +4,42 @@ description "Master role applied to naga"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

+      :internal_ipv4 => {
+        :interface => "bond0",
+        :role => :internal,
+        :family => :inet,
+        :address => "10.0.64.8",
+        :bond => {
+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",
+          :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
+        }
+      },

       :external_ipv4 => {
       :external_ipv4 => {

-        :interface => "ens18",
+        :interface => "bond0.101",

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

-        :address => "185.216.27.232",
-        :prefix => "24",
-        :gateway => "185.216.27.253"
+        :address => "184.104.226.104"

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

-        :interface => "ens18",
+        :interface => "bond0.101",

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

-        :address => "2a07:abc4:5::27:244",
-        :prefix => "24",
-        :gateway => "fe80::20c:29ff:fe4d:941b"
+        :address => "2001:470:1:b3b::8"

       }
     }
       }
     }

-  },
-  :squid => {
-    :cache_mem => "12500 MB",
-    :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
-  },
-  :tilecache => {
-    :tile_parent => "france.render.openstreetmap.org",
-    :tile_siblings => [
-      "noomoahk.openstreetmap.org",
-      "norbert.openstreetmap.org",
-      "ladon.openstreetmap.org",
-      "culebre.openstreetmap.org"
-    ]

   }
 )
 
 run_list(
   }
 )
 
 run_list(

-  "role[proxgroup]",
-  "role[tilecache]"
+  "role[equinix-dub]",
+  "role[hp-g9]",
+  "role[subversion]",
+  "role[trac]",
+  "role[irc]",
+  "role[blogs]",
+  "role[munin]",
+  "recipe[foundation::welcome]",
+  "recipe[stateofthemap::container]"

 )
 )