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

Fix old channel usage on chef client provisioner

This commit is contained in:
Mitchell Hashimoto 2012-10-26 16:39:51 -07:00
parent 625741ab6a
commit 44804ce94b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/provisioners/chef/provisioner/chef_client.rb
View File

@ -61,17 +61,17 @@ module VagrantPlugins
env[:ui].info I18n.t("vagrant.provisioners.chef.client_key_folder") env[:ui].info I18n.t("vagrant.provisioners.chef.client_key_folder")
path = Pathname.new(config.client_key_path) path = Pathname.new(config.client_key_path)
env[:vm].channel.sudo("mkdir -p #{path.dirname}") env[:machine].communicate.sudo("mkdir -p #{path.dirname}")
end end
def upload_validation_key def upload_validation_key
env[:ui].info I18n.t("vagrant.provisioners.chef.upload_validation_key") env[:ui].info I18n.t("vagrant.provisioners.chef.upload_validation_key")
env[:vm].channel.upload(validation_key_path, guest_validation_key_path) env[:machine].communicate.upload(validation_key_path, guest_validation_key_path)
end end
def upload_encrypted_data_bag_secret def upload_encrypted_data_bag_secret
env[:ui].info I18n.t("vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key") env[:ui].info I18n.t("vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key")
env[:vm].channel.upload(encrypted_data_bag_secret_key_path, env[:machine].communicate.upload(encrypted_data_bag_secret_key_path,
config.encrypted_data_bag_secret) config.encrypted_data_bag_secret)
end end
@ -101,7 +101,7 @@ module VagrantPlugins
env[:ui].info I18n.t("vagrant.provisioners.chef.running_client_again") env[:ui].info I18n.t("vagrant.provisioners.chef.running_client_again")
end end
exit_status = env[:vm].channel.sudo(command) do |type, data| exit_status = env[:machine].communicate.sudo(command, :error_check => false) do |type, data|
# Output the data with the proper color based on the stream. # Output the data with the proper color based on the stream.
color = type == :stdout ? :green : :red color = type == :stdout ? :green : :red