diff options
author | danielsdeleo <dan@chef.io> | 2015-09-24 13:28:34 -0700 |
---|---|---|
committer | danielsdeleo <dan@chef.io> | 2015-09-24 13:29:09 -0700 |
commit | 37df1cf0bcc8405ba9d01245dd8cf6ebcceb426b (patch) | |
tree | 7130527d685f2f24b50a255ab5a6cee71d786c86 /lib/chef/policy_builder | |
parent | 33509c1bbb7366d3e2a50f61d8d53161e51eb6fa (diff) | |
download | chef-37df1cf0bcc8405ba9d01245dd8cf6ebcceb426b.tar.gz |
Remove experimental feature warning for policyfilesremove-policyfile-warning
Also, improve the language around unsupported features/options.
Diffstat (limited to 'lib/chef/policy_builder')
-rw-r--r-- | lib/chef/policy_builder/policyfile.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/chef/policy_builder/policyfile.rb b/lib/chef/policy_builder/policyfile.rb index bb9593eb36..d6dcdf67b2 100644 --- a/lib/chef/policy_builder/policyfile.rb +++ b/lib/chef/policy_builder/policyfile.rb @@ -68,22 +68,20 @@ class Chef @node = nil - Chef::Log.warn("Using experimental Policyfile feature") - if Chef::Config[:solo] - raise UnsupportedFeature, "Policyfile does not support chef-solo at this time." + raise UnsupportedFeature, "Policyfile does not support chef-solo. Use chef-client local mode instead." end if override_runlist - raise UnsupportedFeature, "Policyfile does not support override run lists at this time" + raise UnsupportedFeature, "Policyfile does not support override run lists. Use named run_lists instead." end if json_attribs && json_attribs.key?("run_list") - raise UnsupportedFeature, "Policyfile does not support setting the run_list in json data at this time" + raise UnsupportedFeature, "Policyfile does not support setting the run_list in json data." end if Chef::Config[:environment] && !Chef::Config[:environment].chomp.empty? - raise UnsupportedFeature, "Policyfile does not work with Chef Environments" + raise UnsupportedFeature, "Policyfile does not work with Chef Environments." end end |