lib/berkshelf/vagrant/action/upload.rb in berkshelf-0.5.0.rc2 vs lib/berkshelf/vagrant/action/upload.rb in berkshelf-0.5.0.rc3
- old
+ new
@@ -4,20 +4,23 @@
# @author Jamie Winsor <jamie@vialstudios.com>
class Upload
attr_reader :berksfile
attr_reader :node_name
attr_reader :client_key
+ attr_reader :ssl_verify
def initialize(app, env)
@app = app
@node_name = env[:global_config].berkshelf.node_name
@client_key = env[:global_config].berkshelf.client_key
+ @ssl_verify = env[:global_config].berkshelf.client_key
@berksfile = Berksfile.from_file(env[:global_config].berkshelf.berksfile_path)
end
def call(env)
if Berkshelf::Vagrant.chef_client?(env[:global_config])
+ p env[:global_config].berkshelf
upload(env)
end
@app.call(env)
end
@@ -26,12 +29,15 @@
def upload(env)
Berkshelf::Vagrant.provisioners(:chef_client, env[:global_config]).each do |provisioner|
Berkshelf.formatter.msg "uploading cookbooks to '#{provisioner.config.chef_server_url}'"
berksfile.upload(
- provisioner.config.chef_server_url,
- node_name: self.node_name,
- client_key: self.client_key
+ server_url: provisioner.config.chef_server_url,
+ client_name: self.node_name,
+ client_key: self.client_key,
+ ssl: {
+ verify: self.ssl_verify
+ }
)
end
end
end
end