glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity

Remove dependency on Config object to start containers

Browse source
This commit is contained in:
Fabio Rehm 2013-04-09 23:33:30 -03:00
parent c53f9456b7
commit 7187556b6a
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/vagrant-lxc/action/boot.rb
View file

@ -12,7 +12,7 @@ module Vagrant
config = env[:machine].provider_config config = env[:machine].provider_config
env[:ui].info I18n.t("vagrant.actions.vm.boot.booting") env[:ui].info I18n.t("vagrant.actions.vm.boot.booting")
env[:machine].provider.driver.start(config) env[:machine].provider.driver.start(config.customizations)
raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot
@app.call env @app.call env

4
lib/vagrant-lxc/driver.rb
View file

@ -60,14 +60,14 @@ module Vagrant
end end
end end
def start(config) def start(customizations)
@logger.info('Starting container...') @logger.info('Starting container...')
if ENV['LXC_START_LOG_FILE'] if ENV['LXC_START_LOG_FILE']
extra = ['-o', ENV['LXC_START_LOG_FILE'], '-l', 'DEBUG'] extra = ['-o', ENV['LXC_START_LOG_FILE'], '-l', 'DEBUG']
end end
@cli.transition_to(:running) { |c| c.start(config.customizations, (extra || nil)) } @cli.transition_to(:running) { |c| c.start(customizations, (extra || nil)) }
end end
def halt def halt

12
spec/unit/driver_spec.rb
View file

@ -70,9 +70,9 @@ describe Vagrant::LXC::Driver do
end end
describe 'start' do describe 'start' do
let(:name) { 'container-name' } let(:name) { 'container-name' }
let(:config) { fire_double('Vagrant::LXC::Config', customizations: [['a', '1'], ['b', '2']]) } let(:customizations) { [['a', '1'], ['b', '2']] }
let(:cli) { fire_double('Vagrant::LXC::Driver::CLI', start: true) } let(:cli) { fire_double('Vagrant::LXC::Driver::CLI', start: true) }
subject { described_class.new(name, cli) } subject { described_class.new(name, cli) }
@ -81,13 +81,13 @@ describe Vagrant::LXC::Driver do
end end
it 'starts container with configured lxc settings' do it 'starts container with configured lxc settings' do
cli.should_receive(:start).with(config.customizations, nil) cli.should_receive(:start).with(customizations, nil)
subject.start(config) subject.start(customizations)
end end
it 'expects a transition to running state to take place' do it 'expects a transition to running state to take place' do
cli.should_receive(:transition_to).with(:running) cli.should_receive(:transition_to).with(:running)
subject.start(config) subject.start(customizations)
end end
end end