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

Fix public key path

Browse source
This commit is contained in:
Fabio Rehm 2013-03-02 00:03:48 -03:00
parent 227a598917
commit ce8902574c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/vagrant-lxc/container.rb
View file

@ -22,7 +22,7 @@ module Vagrant
def create def create
# FIXME: Ruby 1.8 users dont have SecureRandom # FIXME: Ruby 1.8 users dont have SecureRandom
machine_id = SecureRandom.hex(6) machine_id = SecureRandom.hex(6)
public_key = Vagrant.source_root.join('../keys/vagrant.pub').expand_path.to_s public_key = Vagrant.source_root.join('keys', 'vagrant.pub').expand_path.to_s
log, status = lxc :create, '--template', 'ubuntu-cloud', '--name', machine_id, '--', '-S', public_key log, status = lxc :create, '--template', 'ubuntu-cloud', '--name', machine_id, '--', '-S', public_key
# TODO: Handle errors # TODO: Handle errors
machine_id machine_id

2
spec/unit/container_spec.rb
View file

@ -49,7 +49,7 @@ describe Vagrant::LXC::Container do
describe 'creation' do describe 'creation' do
let(:new_machine_id) { 'random-machine-id' } let(:new_machine_id) { 'random-machine-id' }
let(:public_key_path) { Vagrant.source_root.join('..', 'keys', 'vagrant.pub').expand_path.to_s } let(:public_key_path) { Vagrant.source_root.join('keys', 'vagrant.pub').expand_path.to_s }
before do before do
subject.stub(:lxc) subject.stub(:lxc)