From 2c05a4e9e72bd769a1e4ab6a65c625ac85843629 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Sun, 14 Dec 2014 22:22:12 -0500 Subject: [PATCH] Fix Chef Solo template --- templates/provisioners/chef_solo/solo.erb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/templates/provisioners/chef_solo/solo.erb b/templates/provisioners/chef_solo/solo.erb index b7d08a65b..25d3346b7 100644 --- a/templates/provisioners/chef_solo/solo.erb +++ b/templates/provisioners/chef_solo/solo.erb @@ -5,11 +5,7 @@ file_cache_path "<%= file_cache_path %>" file_backup_path "<%= file_backup_path %>" cookbook_path <%= cookbooks_path.inspect %> <% if roles_path %> -if Chef::VERSION.to_f < 11.8 - role_path <%= roles_path.first.inspect %> -else - role_path <%= roles_path.inspect %> -end +role_path <%= roles_path.size == 1 ? roles_path.first.inspect : roles_path.inspect %> <% end %> log_level <%= log_level.inspect %> verbose_logging <%= verbose_logging.inspect %>