Change the queue name used for identity queues to be distinct from the name format for agents to make writing ACLs easier
Signed-off-by: R.I.Pienaar <[email protected]> --- Local-branch: feature/master/7225 lib/mcollective/runner.rb | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/mcollective/runner.rb b/lib/mcollective/runner.rb index f80d076..ffa67ac 100644 --- a/lib/mcollective/runner.rb +++ b/lib/mcollective/runner.rb @@ -48,8 +48,12 @@ module MCollective Util.subscribe(controltopics) if @config.identity_queue - Log.debug("Subscribing to identity queue") - Util.subscribe(Util.make_target(@config.identity, :command, @config.main_collective, true)) + queue_name = ["identity_queue", @config.identity].join(@config.topicsep) + target = Util.make_target(queue_name, :command, @config.main_collective, true) + + Log.debug("Subscribing to identity queue #{target}") + + Util.subscribe(target) end # Start the registration plugin if interval isn't 0 -- 1.7.1 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
