summaryrefslogtreecommitdiffstats
path: root/lib/puppet/parser/collector.rb
diff options
context:
space:
mode:
authorBrice Figureau <brice-puppet@daysofwonder.com>2009-06-03 21:10:36 +0200
committerJames Turnbull <james@lovedthanlost.net>2009-06-06 09:52:53 +1000
commitf9516d49a02facb43e2856766b6439673450fdd1 (patch)
tree06df981d0a51f55d8a749706ae7d349e6b5401ec /lib/puppet/parser/collector.rb
parentb5855ec1a5af2bec6c4ac35f8e6a885999b09bf9 (diff)
downloadpuppet-f9516d49a02facb43e2856766b6439673450fdd1.tar.gz
puppet-f9516d49a02facb43e2856766b6439673450fdd1.tar.xz
puppet-f9516d49a02facb43e2856766b6439673450fdd1.zip
Make sure virtual and rails query use tags when tag are searched
Up to now, when trying to match with tags: File<<| tag == 'value' |>> in fact we were querying parameters. Hopefully all the user tags are stored in parameters so it was working. But it wasn't possible to search on auto-tags (like class name). This patch makes sure searching by tag is done on tags both on the rails side and the resource side. Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/parser/collector.rb')
-rw-r--r--lib/puppet/parser/collector.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/parser/collector.rb b/lib/puppet/parser/collector.rb
index ece420536..5f11a6cea 100644
--- a/lib/puppet/parser/collector.rb
+++ b/lib/puppet/parser/collector.rb
@@ -102,7 +102,7 @@ class Puppet::Parser::Collector
raise Puppet::DevError, "Cannot collect resources for a nil host" unless @scope.host
host = Puppet::Rails::Host.find_by_name(@scope.host)
- query = {:include => {:param_values => :param_name}}
+ query = {:include => {:param_values => :param_name, :puppet_tags => :resource_tags}}
search = "(exported=? AND restype=?)"
values = [true, @type]