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

[chef.git] / roles / norbert.rb

diff --git a/roles/norbert.rb b/roles/norbert.rb
index 7c31bb8f497c8c298658349bd9d1335512a19556..50b8566ea36aa8fbfeefb1efb7443cba9898c2a1 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -2,10 +2,6 @@ name "norbert"
 description "Master role applied to norbert"
 
 default_attributes(
 description "Master role applied to norbert"
 
 default_attributes(

-  :dhcpd => {
-    :first_address => "10.0.63.1",
-    :last_address => "10.0.63.254"
-  },

   :networking => {
     :interfaces => {
       :internal => {
   :networking => {
     :interfaces => {
       :internal => {


@@ -40,11 +36,9 @@ default_attributes(
 
 run_list(
   "role[equinix-ams]",
 
 run_list(
   "role[equinix-ams]",

-  "role[gateway]",

   "role[geodns]",
   "role[backup]",
   "role[planet]",
   "role[planetdump]",
   "role[geodns]",
   "role[backup]",
   "role[planet]",
   "role[planetdump]",

-  "recipe[dhcpd]",

   "recipe[tilelog]"
 )
   "recipe[tilelog]"
 )