Updated Vagrant's basebox and cookbooks to Chef 0.10.10

This commit is contained in:
Maxim Kulkin 2012-05-22 18:32:09 +04:00
parent 5a1dcae934
commit cfe546eb37
2 changed files with 3 additions and 3 deletions

4
Vagrantfile vendored
View File

@ -2,8 +2,8 @@
# vi: set ft=ruby :
Vagrant::Config.run do |config|
config.vm.box = "ubuntu-12.04-server-amd64"
config.vm.box_url = "http://mc0n1-srt.srt.mirantis.net/ubuntu-12.04-server-amd64.box"
config.vm.box = "ubuntu-12.04-server-amd64-002"
config.vm.box_url = "http://mc0n1-srt.srt.mirantis.net/ubuntu-12.04-server-amd64-002.box"
config.vm.forward_port 80, 8080
# config.vm.forward_port 8000, 8000

View File

@ -126,7 +126,7 @@ def current_installed_version
end
p = shell_out!(version_check_cmd)
p.stdout.split(delimeter)[1].strip
rescue Chef::Exceptions::ShellCommandFailed
rescue Mixlib::ShellOut::ShellCommandFailed
end
end