Fix bad const. ref in deprecation/provider/template

Fixes CHEF-4406 http://tickets.opscode.com/browse/CHEF-4406

Calls to Chef::Provider::Template#template_location and #template_finder
will now correctly reference the Chef::Provider::TemplateFinder class.
Chef::Provider::Package#preseed_resource uses these methods expecting an
error to be raised only if there is no template with the desired name,
which triggers a fallback to cookbook_file-based preseed files.

This patch restores the template-based preseed functionality, but will
trigger deprecation warnings from within Chef::Provider::Package's
internal code.

3 files changed, 3 insertions, 6 deletions

diff --git a/lib/chef/deprecation/provider/template.rb b/lib/chef/deprecation/provider/template.rb
index 3d8071f00b..d7a228e97a 100644
--- a/lib/chef/deprecation/provider/template.rb
+++ b/lib/chef/deprecation/provider/template.rb
@@ -33,7 +33,7 @@ class Chef
 
         def template_finder
           @template_finder ||= begin
-            TemplateFinder.new(run_context, cookbook_name, node)
+            Chef::Provider::TemplateFinder.new(run_context, cookbook_name, node)
           end
         end
 
diff --git a/spec/data/cookbooks/preseed/templates/default/preseed-template.seed b/spec/data/cookbooks/preseed/templates/default/preseed-template.seed
index 164da3495d..6229ac83f5 100644
--- a/spec/data/cookbooks/preseed/templates/default/preseed-template.seed
+++ b/spec/data/cookbooks/preseed/templates/default/preseed-template.seed
@@ -1 +1 @@
-chef-integration-test chef-integration-test/sample-var string "hello world"
+chef-integration-test chef-integration-test/sample-var string "<%= node[:preseed_value] -%>"
diff --git a/spec/functional/resource/package_spec.rb b/spec/functional/resource/package_spec.rb
index 98336d81b6..b5f8e5dc66 100644
--- a/spec/functional/resource/package_spec.rb
+++ b/spec/functional/resource/package_spec.rb
@@ -265,7 +265,7 @@ describe Chef::Resource::Package, metadata do
 
         end
 
-        context "with a preseed template is specified" do
+        context "with a preseed template" do
 
           let(:package_resource) do
             r = base_resource
@@ -279,9 +279,6 @@ describe Chef::Resource::Package, metadata do
           end
 
           it "preseeds the package, then installs it" do
-            pending("CHEF-4406")
-            Chef::Log.init(STDERR)
-            Chef::Log.level = :debug
             package_resource.run_action(:install)
             cmd = shell_out!("debconf-show chef-integration-test")
             cmd.stdout.should include('chef-integration-test/sample-var: "FROM TEMPLATE"')