Move remaining planet serving work to norbert

diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb
index 7d703858f68dfa1ac46b0e05219f075effa2a990..eb6ff6c53bbb54567aab26eff6647eaf06392f4e 100644 (file)
--- a/roles/ironbelly.rb
+++ b/roles/ironbelly.rb
@@ -55,9 +55,6 @@ default_attributes(
       }
     }
   },
-  :planet => {
-    :replication => "enabled"
-  },
   :prometheus => {
     :snmp => {
       "pdu1" => { :address => "10.0.48.100", :modules => %w[apcups], :labels => { "site" => "amsterdam" } },
@@ -105,8 +102,6 @@ run_list(
   "role[equinix-ams]",
   "role[gateway]",
   "role[supybot]",
-  "role[planet]",
   "recipe[rsyncd]",
-  "recipe[dhcpd]",
-  "recipe[tilelog]"
+  "recipe[dhcpd]"
 )

diff --git a/roles/norbert.rb b/roles/norbert.rb
index fe41d529b81822f3895a38edf31256e56601f835..ae57f844bf0d85e831a6e4b630edce24b4ecc255 100644 (file)
--- a/roles/norbert.rb
+++ b/roles/norbert.rb
@@ -30,6 +30,9 @@ default_attributes(
       }
 
     }
+  },
+  :planet => {
+    :replication => "enabled"
   }
 )
 
@@ -38,5 +41,6 @@ run_list(
   "role[geodns]",
   "role[backup]",
   "role[planet]",
-  "role[planetdump]"
+  "role[planetdump]",
+  "recipe[tilelog]"
 )