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

[chef.git] / roles / tabaluga.rb

diff --git a/roles/tabaluga.rb b/roles/tabaluga.rb
index 8645291918de796b0a19b15323b557898658e735..191c92d3e0a1d93c0a6129a2764720ba444c96cf 100644 (file)
--- a/roles/tabaluga.rb
+++ b/roles/tabaluga.rb
@@ -2,6 +2,10 @@ name "tabaluga"
 description "Master role applied to tabaluga"
 
 default_attributes(
 description "Master role applied to tabaluga"
 
 default_attributes(

+  :dhcpd => {
+    :first_address => "10.0.62.1",
+    :last_address => "10.0.62.254"
+  },

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


@@ -30,7 +34,8 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix]",
+  "role[equinix-ams]",

   "role[hp-g9]",
   "role[hp-g9]",

-  "role[wiki]"
+  "role[wiki]",
+  "recipe[dhcpd]"

 )
 )