Merge remote-tracking branch 'github/pull/358' into master

[chef.git] / roles / naga.rb

diff --git a/roles/naga.rb b/roles/naga.rb
index 664510b1f845729bbc1c5d5bfd39bed8be36a08b..5ff6a358874a83775861af755026194668cecb28 100644 (file)
--- a/roles/naga.rb
+++ b/roles/naga.rb
@@ -3,23 +3,31 @@ description "Master role applied to naga"
 
 default_attributes(
   :hardware => {
 
 default_attributes(
   :hardware => {

-    :shm_size => "38g"
+    :shm_size => "14g"

   },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
   },
   :networking => {
     :interfaces => {
       :external_ipv4 => {

-        :interface => "eno1",
+        :interface => "ens18",

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

-        :address => "185.116.130.151",
-        :prefix => "24",
-        :gateway => "185.116.130.151"
+        :address => "45.13.104.40",
+        :prefix => "32",
+        :gateway => "10.0.4.1"
+      },
+      :external_ipv6 => {
+        :interface => "ens18",
+        :role => :external,
+        :family => :inet6,
+        :address => "2a0b:cbc0:1101:1::41",
+        :prefix => "64",
+        :gateway => "2a0b:cbc0:1101:1::1"

       }
     }
   },
   :squid => {
     :version => 4,
       }
     }
   },
   :squid => {
     :version => 4,

-    :cache_mem => "32768 MB",
+    :cache_mem => "10240 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",
     :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",


@@ -33,6 +41,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[fullsave]",
+  "role[milkywan]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )