Wait for container to be accessible after starting it
This commit is contained in:
parent
59267d01e6
commit
03f823130c
1 changed files with 35 additions and 2 deletions
|
@ -1,21 +1,54 @@
|
||||||
module Vagrant
|
module Vagrant
|
||||||
module LXC
|
module LXC
|
||||||
module Action
|
module Action
|
||||||
# DISCUSS: The Boot action has a different meaning on VB provider and it
|
|
||||||
# assumes the machine has been started already.
|
|
||||||
class Boot < BaseAction
|
class Boot < BaseAction
|
||||||
def call(env)
|
def call(env)
|
||||||
|
@env = env
|
||||||
|
|
||||||
config = env[:machine].provider_config
|
config = env[:machine].provider_config
|
||||||
|
|
||||||
# Allows this middleware to be called multiple times. We need to
|
# Allows this middleware to be called multiple times. We need to
|
||||||
# support this as base boxes might have after create scripts which
|
# support this as base boxes might have after create scripts which
|
||||||
# require SSH access
|
# require SSH access
|
||||||
unless env[:machine].state.running?
|
unless env[:machine].state.running?
|
||||||
|
env[:ui].info I18n.t("vagrant.actions.vm.boot.booting")
|
||||||
env[:machine].provider.container.start(config)
|
env[:machine].provider.container.start(config)
|
||||||
|
raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot
|
||||||
end
|
end
|
||||||
|
|
||||||
@app.call env
|
@app.call env
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Stolen from on VagrantPlugins::ProviderVirtualBox::Action::Boot
|
||||||
|
def wait_for_boot
|
||||||
|
@env[:ui].info I18n.t("vagrant.actions.vm.boot.waiting")
|
||||||
|
|
||||||
|
@env[:machine].config.ssh.max_tries.to_i.times do |i|
|
||||||
|
if @env[:machine].communicate.ready?
|
||||||
|
@env[:ui].info I18n.t("vagrant.actions.vm.boot.ready")
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
# Return true so that the vm_failed_to_boot error doesn't
|
||||||
|
# get shown
|
||||||
|
return true if @env[:interrupted]
|
||||||
|
|
||||||
|
# TODO: Find out if there is a command to check if the machine is
|
||||||
|
# starting, `lxc-monitor` shows this information, but I've
|
||||||
|
# never seen it on `lxc-info` which is what it is being used
|
||||||
|
# to determine container status
|
||||||
|
|
||||||
|
# If the VM is not starting or running, something went wrong
|
||||||
|
# and we need to show a useful error.
|
||||||
|
state = @env[:machine].provider.state.id
|
||||||
|
raise Vagrant::Errors::VMFailedToRun if state != :starting && state != :running
|
||||||
|
|
||||||
|
sleep 2 if !@env["vagrant.test"]
|
||||||
|
end
|
||||||
|
|
||||||
|
@env[:ui].error I18n.t("vagrant.actions.vm.boot.failed")
|
||||||
|
false
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue