The "collectable" syntax now works end-to-end -- the parser correctly recognizes it, the AST objects retain the settings, the scopes do the right conversion, the interpreter stores them all in the database, and then it strips the collectable objects out before sending the object list to the client

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1189 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index a11e870ab..5ddd82829 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -246,13 +246,21 @@ module Puppet
                             raise LoadError,
                                 "storeconfigs is enabled but rails is unavailable"
                         end
-                        Puppet::Rails.init
                     end
+
+                    Puppet::Rails.init
+
+                    # We store all of the objects, even the collectable ones
                     Puppet::Rails::Host.store(
                         :objects => objects,
                         :host => client,
                         :facts => facts
                     )
+
+                    # Now that we've stored everything, we need to strip out
+                    # the collectable objects so that they are not sent on
+                    # to the host
+                    objects.collectstrip!
                 end
 
                 return objects