Merge branch 'maint/2.5.x/pick_explicitly_load_functions' into maint/2.5.x/pick_compatible_new_functionality

* maint/2.5.x/pick_explicitly_load_functions:
  Explicitly load functions used by ensure_resource

1 files changed, 2 insertions, 0 deletions

diff --git a/lib/puppet/parser/functions/ensure_resource.rb b/lib/puppet/parser/functions/ensure_resource.rb
index 6a9e2ed..fba2035 100644
--- a/lib/puppet/parser/functions/ensure_resource.rb
+++ b/lib/puppet/parser/functions/ensure_resource.rb
@@ -25,9 +25,11 @@ ENDOFDOC
   raise(ArgumentError, 'Must specify a type') unless type
   raise(ArgumentError, 'Must specify a title') unless title
   params ||= {}
+  Puppet::Parser::Functions.function(:defined_with_params)
   if function_defined_with_params(["#{type}[#{title}]", params])
     Puppet.debug("Resource #{type}[#{title}] not created b/c it already exists")
   else
+    Puppet::Parser::Functions.function(:create_resources)
     function_create_resources([type.capitalize, { title => params }])
   end
 end