Move vendored_vagrant require to the right place
This commit is contained in:
parent
62ecb3cee1
commit
238b5cd681
3 changed files with 3 additions and 4 deletions
|
@ -1,7 +1,6 @@
|
||||||
# FIXME: Ruby 1.8 users dont have SecureRandom
|
# FIXME: Ruby 1.8 users dont have SecureRandom
|
||||||
require 'securerandom'
|
require 'securerandom'
|
||||||
|
|
||||||
require "vendored_vagrant"
|
|
||||||
require "vagrant/util/retryable"
|
require "vagrant/util/retryable"
|
||||||
require "vagrant/util/subprocess"
|
require "vagrant/util/subprocess"
|
||||||
|
|
||||||
|
@ -9,7 +8,6 @@ require "vagrant-lxc/errors"
|
||||||
|
|
||||||
module Vagrant
|
module Vagrant
|
||||||
module LXC
|
module LXC
|
||||||
# REFACTOR: Encapsulate lxc commands with name
|
|
||||||
class Container
|
class Container
|
||||||
# Include this so we can use `Subprocess` more easily.
|
# Include this so we can use `Subprocess` more easily.
|
||||||
include Vagrant::Util::Retryable
|
include Vagrant::Util::Retryable
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
|
require "log4r"
|
||||||
|
|
||||||
require "vagrant-lxc/action"
|
require "vagrant-lxc/action"
|
||||||
require "vagrant-lxc/container"
|
require "vagrant-lxc/container"
|
||||||
require "vagrant-lxc/machine_state"
|
require "vagrant-lxc/machine_state"
|
||||||
|
|
||||||
require "log4r"
|
|
||||||
|
|
||||||
module Vagrant
|
module Vagrant
|
||||||
module LXC
|
module LXC
|
||||||
class Provider < Vagrant.plugin("2", :provider)
|
class Provider < Vagrant.plugin("2", :provider)
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
require 'unit_helper'
|
require 'unit_helper'
|
||||||
|
|
||||||
|
require "vendored_vagrant"
|
||||||
require 'vagrant-lxc/container'
|
require 'vagrant-lxc/container'
|
||||||
|
|
||||||
describe Vagrant::LXC::Container do
|
describe Vagrant::LXC::Container do
|
||||||
|
|
Loading…
Add table
Reference in a new issue