Merge pull request #203 from vjanelle/federations

(#202) pass federations properly down from choria playbooks

lib/mcollective/ddl/discoveryddl.rb

@@ -11,7 +11,7 @@ module DDL
     #             :timeout     => 2
     #
     # discovery do
-    #     capabilities [:classes, :facts, :identity, :agents, :compound]
+    #     capabilities [:classes, :facts, :identity, :agents, :compound, :federations]
     # end
     class DiscoveryDDL < Base
       def discovery_interface
@@ -25,10 +25,10 @@ def capabilities(*caps)
         raise "Discovery plugin capabilities can't be empty" if caps.empty?
 
         caps.each do |cap|
-          if [:classes, :facts, :identity, :agents, :compound].include?(cap)
+          if [:classes, :facts, :identity, :agents, :compound, :federations].include?(cap)
             @entities[:discovery][:capabilities] << cap
           else
-            raise "%s is not a valid capability, valid capabilities are :classes, :facts, :identity, :agents and :compound" % cap
+            raise "%s is not a valid capability, valid capabilities are :classes, :facts, :identity, :agents, :compound, and :federations" % cap
           end
         end
       end

lib/mcollective/discovery/external.ddl

@@ -7,7 +7,7 @@ metadata    :name        => "external",
             :timeout     => 2
 
 discovery do
-    capabilities [:classes, :facts, :identity, :agents, :compound]
+    capabilities [:classes, :facts, :identity, :agents, :compound, :federations]
 end
 
 

lib/mcollective/util.rb

@@ -217,7 +217,7 @@ def self.default_options
         :discovery_method => nil,
         :discovery_options => Config.instance.default_discovery_options,
         :filter => empty_filter,
-        :federations => []
+        :federations => Config.instance.federations
       }
     end
 

lib/mcollective/util/playbook/nodes/mcollective_nodes.rb

@@ -9,6 +9,7 @@ def initialize
             @facts = []
             @classes = []
             @identity = []
+            @federations = []
             @compound = nil
           end