Only apply the geodns role to machines that need it

diff --git a/roles/fume.rb b/roles/fume.rb
index e2e35be2905365363a95658e3891bf591768d8e7..88b23ab70afcc3b6b707ddd5c7c331ba6a56b79f 100644 (file)
--- a/roles/fume.rb
+++ b/roles/fume.rb
@@ -58,5 +58,6 @@ default_attributes(
 
 run_list(
   "role[teleservice]",
 
 run_list(
   "role[teleservice]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )

diff --git a/roles/jakelong.rb b/roles/jakelong.rb
index de44f7f2caf2436ee13aa4d54c5a81ae414bbc89..3e7501c8eb1baf6a95bea073cc5623fbbc8b6b71 100644 (file)
--- a/roles/jakelong.rb
+++ b/roles/jakelong.rb
@@ -59,5 +59,6 @@ default_attributes(
 
 run_list(
   "role[prgmr]",
 
 run_list(
   "role[prgmr]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )

diff --git a/roles/katie.rb b/roles/katie.rb
index 56af801fdc78220e52d426be40077ce054639334..2dc82fc1587b7cbdb0e759dd854dcc86436796ed 100644 (file)
--- a/roles/katie.rb
+++ b/roles/katie.rb
@@ -42,5 +42,6 @@ default_attributes(
 
 run_list(
   "role[hetzner]",
 
 run_list(
   "role[hetzner]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )

diff --git a/roles/saphira.rb b/roles/saphira.rb
index dc01144a44b3048506bb5bc6490bbf496bf31e99..5b83ea7d801bd913032a186ce7d0a9e2aa45f5df 100644 (file)
--- a/roles/saphira.rb
+++ b/roles/saphira.rb
@@ -41,5 +41,6 @@ default_attributes(
 
 run_list(
   "role[jump]",
 
 run_list(
   "role[jump]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )

diff --git a/roles/stormfly-02.rb b/roles/stormfly-02.rb
index 9c31e1fb7cdcbd440254c9d5054b16d6274ba6d5..b9b33926272f7da009b4902eb60ad8bd9f1208ed 100644 (file)
--- a/roles/stormfly-02.rb
+++ b/roles/stormfly-02.rb
@@ -31,5 +31,6 @@ default_attributes(
 run_list(
   "role[osuosl]",
   "role[hp-dl360-g6]",
 run_list(
   "role[osuosl]",
   "role[hp-dl360-g6]",

+  "role[geodns]",

   "role[tilecache]"
 )
   "role[tilecache]"
 )

diff --git a/roles/tilecache.rb b/roles/tilecache.rb
index e60598efe64288c958648684777b1b0b0e24f8b5..438f61992d27d2395a15ef38f5b3a61c6add9f6c 100644 (file)
--- a/roles/tilecache.rb
+++ b/roles/tilecache.rb
@@ -35,6 +35,5 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[geodns]",

   "recipe[tilecache]"
 )
   "recipe[tilecache]"
 )