Skip to content
This repository has been archived by the owner on Mar 19, 2022. It is now read-only.

Added support of passing options for berkshelf via knife.rb #369

Merged
merged 3 commits into from
May 3, 2015
Merged

Added support of passing options for berkshelf via knife.rb #369

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29c9727
Added support of passing options for berkshelf via knife.rb
iavael May 21, 2014
c15f561
Fixed for compatibility with Berkshelf 2
iavael Jan 20, 2015
5f1049e
Removed unnecessary check
iavael May 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion lib/knife-solo/berkshelf.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ def install!
path = berkshelf_path
ui.msg "Installing Berkshelf cookbooks to '#{path}'..."

berksfile = ::Berkshelf::Berksfile.from_file('Berksfile')
if Gem::Version.new(::Berkshelf::VERSION) >= Gem::Version.new("3.0.0")
berkshelf_options = KnifeSolo::Tools.config_value(config, :berkshelf_options) || {}
berksfile = ::Berkshelf::Berksfile.from_file('Berksfile',berkshelf_options)
else
berksfile = ::Berkshelf::Berksfile.from_file('Berksfile')
end
if berksfile.respond_to?(:vendor)
FileUtils.rm_rf(path)
berksfile.vendor(path)
Expand Down