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

[chef.git] / roles / noquiklos.rb

diff --git a/roles/noquiklos.rb b/roles/noquiklos.rb
index 8e24fd027fac552c9350413d84b9b64d1f1f819d..99f2a459c0c6c022c6b29f7a5349c32f80598b6e 100644 (file)
--- a/roles/noquiklos.rb
+++ b/roles/noquiklos.rb
@@ -2,25 +2,29 @@ name "noquiklos"
 description "Master role applied to noquiklos"
 
 default_attributes(
 description "Master role applied to noquiklos"
 
 default_attributes(

+  :memcached => {
+    :memory_limit => 24 * 1024
+  },

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

-        :interface => "eth0",
+        :interface => "eth0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.13"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.13"
       },
       :external_ipv4 => {

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

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

-        :address => "128.40.168.99"
+        :address => "193.60.236.16"

       }
     }
   }
 )
 
 run_list(
       }
     }
   }
 )
 
 run_list(

-  "role[ucl-internal]",
+  "role[ucl]",
+  "role[hp-dl360-g6]",

   "role[gps-tile]"
 )
   "role[gps-tile]"
 )