lib/cluster_chef/server.rb in cluster_chef-3.0.10 vs lib/cluster_chef/server.rb in cluster_chef-3.0.11

@@ -134,10 +134,11 @@
     #
     # Assembles the combined runlist.
     #
     # * run_list :first  items -- cluster then facet then server
     # * run_list :normal items -- cluster then facet then server
+    # * own roles: cluster_role then facet_role
     # * run_list :last   items -- cluster then facet then server
     #
     #    ClusterChef.cluster(:my_cluster) do
     #      role('f',  :last)
     #      role('c')
@@ -150,15 +151,15 @@
     #      role('a', :first)
     #      role('g', :last)
     #    end
     #
     # produces
-    #    cluster list  [a] [c] [fg]
-    #    facet list    [b] [de] [h]
+    #    cluster list  [a] [c]  [cluster_role] [fg]
+    #    facet list    [b] [de] [facet_role]   [h]
     #
     # yielding run_list
-    #     ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h']
+    #     ['a', 'b', 'c', 'd', 'e', 'cr', 'fr', 'f', 'g', 'h']
     #
     # Avoid duplicate conflicting declarations. If you say define things more
     # than once, the *earliest encountered* one wins, even if it is elsewhere
     # marked :last.
     #
@@ -166,9 +167,10 @@
       cg = @cluster.run_list_groups
       fg = @facet.run_list_groups
       sg = self.run_list_groups
       [ cg[:first],  fg[:first],  sg[:first],
         cg[:normal], fg[:normal], sg[:normal],
+        cg[:own],    fg[:own],
         cg[:last],   fg[:last],   sg[:last], ].flatten.compact.uniq
     end
 
     #
     # This prepares a composited view of the volumes -- it shows the cluster