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

[chef.git] / roles / taginfo.rb

diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index 9da56f28c2903015501474ff6079101bc25f0a49..40bffdce2f48f91b0e45504523325a9e9712a081 100644 (file)
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -8,7 +8,6 @@ default_attributes(
         :status => :administrator
       },
       :taginfo => {
-        :status => :role,
         :members => [:jochen, :tomh]
       }
     }
@@ -27,16 +26,6 @@ default_attributes(
   :passenger => {
     :max_pool_size => 50
   },
-  :planet => {
-    :current => {
-      :jobs => {
-        :taginfo => {
-          :command => "/usr/local/bin/taginfo-update",
-          :user => "taginfo"
-        }
-      }
-    }
-  },
   :taginfo => {
     :sites => [
       {
@@ -52,6 +41,5 @@ default_attributes(
 )
 
 run_list(
-  "role[planet-current]",
   "recipe[taginfo]"
 )