Use new style extension initialisation for osmtaginfo

[chef.git] / roles / urmel.rb

diff --git a/roles/urmel.rb b/roles/urmel.rb
index 813dae06043af360816389f8cbe9643492664321..dba68ec664c5bf6dec2a1cf4c0d36de5d0cd4436 100644 (file)
--- a/roles/urmel.rb
+++ b/roles/urmel.rb
@@ -2,31 +2,26 @@ name "urmel"
 description "Master role applied to urmel"
 
 default_attributes(
 description "Master role applied to urmel"
 
 default_attributes(

-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
-    }
-  },

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

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

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

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

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

-        :address => "128.40.45.207"
+        :address => "193.60.236.21"

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

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

   "role[munin]"
 )
   "role[munin]"
 )