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

[chef.git] / roles / urmel.rb

diff --git a/roles/urmel.rb b/roles/urmel.rb
index 1f78688d9343ba1b44dcd6e6ce574d1d73b83b5e..dba68ec664c5bf6dec2a1cf4c0d36de5d0cd4436 100644 (file)
--- a/roles/urmel.rb
+++ b/roles/urmel.rb
@@ -5,13 +5,13 @@ default_attributes(
   :networking => {
     :interfaces => {
       :internal_ipv4 => {
   :networking => {
     :interfaces => {
       :internal_ipv4 => {

-        :interface => "eth1",
+        :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.2800",
+        :interface => "eth0.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.21"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.21"


@@ -21,7 +21,7 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[ucl-slough]",
+  "role[ucl]",

   "role[hp-dl360-g6]",
   "role[munin]"
 )
   "role[hp-dl360-g6]",
   "role[munin]"
 )