Restore role for tabaluga

[chef.git] / roles / tabaluga.rb

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 3293268edbf715324ba8be186ea5a9f788b5c951..60b585475558598bee75975a6812b0cbf062c0fc 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -2,10 +2,6 @@ name "tabaluga"
 description "Master role applied to tabaluga"
 
 default_attributes(
-  :dhcpd => {
-    :first_address => "10.0.62.1",
-    :last_address => "10.0.62.254"
-  },
   :networking => {
     :interfaces => {
       :internal => {
@@ -25,10 +21,10 @@ default_attributes(
         :interface => "bond0.2",
         :role => :external,
         :inet => {
-          :address => "130.117.76.14"
+          :address => "184.104.179.142"
         },
         :inet6 => {
-          :address => "2001:978:2:2c::172:e"
+          :address => "2001:470:1:fa1::e"
         }
       }
     }
@@ -37,6 +33,5 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
-  "role[hp-g9]",
-  "recipe[dhcpd]"
+  "role[hp-g9]"
 )