Fall back to dnsmasq
leases file if not able to fetch IP with lxc-attach
Closes GH-118
This commit is contained in:
parent
18bb9482d5
commit
175c40765a
2 changed files with 7 additions and 3 deletions
|
@ -2,8 +2,9 @@
|
||||||
|
|
||||||
IMPROVEMENTS:
|
IMPROVEMENTS:
|
||||||
|
|
||||||
- New base boxes with support for lxc 1.0+
|
- Fall back to `dnsmasq` leases file if not able to fetch IP with `lxc-attach` [#118](https://github.com/fgrehm/vagrant-lxc/issues/118)
|
||||||
- Make sure lxc templates are executable prior to `lxc-create` [#128](https://github.com/fgrehm/vagrant-lxc/issues/128)
|
- Make sure lxc templates are executable prior to `lxc-create` [#128](https://github.com/fgrehm/vagrant-lxc/issues/128)
|
||||||
|
- New base boxes with support for lxc 1.0+
|
||||||
|
|
||||||
BUG FIXES:
|
BUG FIXES:
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,9 @@ module Vagrant
|
||||||
|
|
||||||
def call(env)
|
def call(env)
|
||||||
env[:machine_ip] ||= assigned_ip(env)
|
env[:machine_ip] ||= assigned_ip(env)
|
||||||
|
rescue LXC::Errors::ExecuteError
|
||||||
|
@logger.info 'Unable to fetch IP with `lxc-attach`!'
|
||||||
|
ensure
|
||||||
@app.call(env)
|
@app.call(env)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue