haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3604 from lamont-granquist/lcg/fix-prerelease-versions 

fix chef version checking
This commit is contained in:
Teemu Matilainen 2014-05-01 19:46:52 -03:00
parent 1b698f6ce8 56a22db6e2
commit 8e8a834640
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/provisioners/chef_solo/solo.erb
View File

@ -1,5 +1,3 @@
require 'chef/version_constraint'
<% if node_name %>
node_name "<%= node_name %>"
<% end %>
@ -7,7 +5,7 @@ file_cache_path "<%= file_cache_path %>"
file_backup_path "<%= file_backup_path %>"
cookbook_path <%= cookbooks_path.inspect %>
<% if roles_path %>
if Chef::VersionConstraint.new("< 11.8.0").include?(Chef::VERSION)
if Chef::VERSION.to_f < 11.8
role_path <%= roles_path.first.inspect %>
else
role_path <%= roles_path.inspect %>