Autoload provisioners.

This commit is contained in:
Mitchell Hashimoto 2011-12-14 22:49:14 -08:00
parent b428072bb5
commit e5303a82e0
4 changed files with 15 additions and 8 deletions

View File

@ -30,6 +30,7 @@ module Vagrant
autoload :Errors, 'vagrant/errors' autoload :Errors, 'vagrant/errors'
autoload :Hosts, 'vagrant/hosts' autoload :Hosts, 'vagrant/hosts'
autoload :Plugin, 'vagrant/plugin' autoload :Plugin, 'vagrant/plugin'
autoload :Provisioners, 'vagrant/provisioners'
autoload :Registry, 'vagrant/registry' autoload :Registry, 'vagrant/registry'
autoload :SSH, 'vagrant/ssh' autoload :SSH, 'vagrant/ssh'
autoload :TestHelpers, 'vagrant/test_helpers' autoload :TestHelpers, 'vagrant/test_helpers'
@ -100,7 +101,6 @@ Vagrant.provisioners.register(:shell) { Vagrant::Provisioners::Shell }
# Load the things which must be loaded before anything else. # Load the things which must be loaded before anything else.
require 'vagrant/command' require 'vagrant/command'
require 'vagrant/provisioners'
require 'vagrant/systems' require 'vagrant/systems'
require 'vagrant/version' require 'vagrant/version'
Vagrant::Plugin.load! Vagrant::Plugin.load!

View File

@ -1,9 +1,12 @@
# These aren't autoloaded because they have to register things such # These aren't autoloaded because they have to register things such
# as configuration classes right away with Vagrant. # as configuration classes right away with Vagrant.
require 'vagrant/provisioners/base' module Vagrant
require 'vagrant/provisioners/chef' module Provisioners
require 'vagrant/provisioners/chef_client' autoload :Base, 'vagrant/provisioners/base'
require 'vagrant/provisioners/chef_solo' autoload :ChefSolo, 'vagrant/provisioners/chef_solo'
require 'vagrant/provisioners/puppet' autoload :ChefClient, 'vagrant/provisioners/chef_client'
require 'vagrant/provisioners/puppet_server' autoload :Puppet, 'vagrant/provisioners/puppet'
require 'vagrant/provisioners/shell' autoload :PuppetServer, 'vagrant/provisioners/puppet_server'
autoload :Shell, 'vagrant/provisioners/shell'
end
end

View File

@ -1,5 +1,7 @@
require 'pathname' require 'pathname'
require 'vagrant/provisioners/chef'
module Vagrant module Vagrant
module Provisioners module Provisioners
# This class implements provisioning via chef-client, allowing provisioning # This class implements provisioning via chef-client, allowing provisioning

View File

@ -1,3 +1,5 @@
require 'vagrant/provisioners/chef'
module Vagrant module Vagrant
module Provisioners module Provisioners
# This class implements provisioning via chef-solo. # This class implements provisioning via chef-solo.