(#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/delegate.rb

@@ -39,9 +39,7 @@ def self.discover(filter, timeout, limit, client)
           cmd << "-S" << c.first["expr"]
         end
 
-        unless @config.federations.empty?
-          cmd << "--federations" << @config.federations.join(",")
-        end
+        cmd << "--federations" << @config.federations.join(",") unless @config.federations.empty?
 
         client.options.fetch(:discovery_options, []).each do |opt|
           cmd << "--do" << opt

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/rpc.rb

@@ -26,7 +26,6 @@ def rpcoptions
 
         Helpers.add_simplerpc_options(parser, opts)
       end
-
     end
 
     # Wrapper to create clients, supposed to be used as

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/choria.rb

@@ -97,7 +97,7 @@ def federated?
       #
       # @return [Array<String>]
       def federation_collectives
-        if (@config.federations.length > 0)
+        if !@config.federations.empty?
           @config.federations
         elsif (override_networks = env_fetch("CHORIA_FED_COLLECTIVE", nil))
           override_networks.split(",").map(&:strip).reject(&:empty?)

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

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