From 590f648fc0b562fead0a7824c3c835be01fec14e Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 26 Jun 2012 16:02:44 -0700 Subject: [PATCH] Built-in plugins use Vagrant.plugin("1", :config) --- plugins/guests/freebsd/config.rb | 2 +- plugins/guests/linux/config.rb | 2 +- plugins/guests/solaris/config.rb | 2 +- plugins/kernel_v1/config/nfs.rb | 2 +- plugins/kernel_v1/config/package.rb | 2 +- plugins/kernel_v1/config/ssh.rb | 2 +- plugins/kernel_v1/config/vagrant.rb | 2 +- plugins/kernel_v1/config/vm.rb | 2 +- plugins/provisioners/chef/provisioner/base.rb | 2 +- plugins/provisioners/puppet/provisioner/puppet.rb | 2 +- plugins/provisioners/puppet/provisioner/puppet_server.rb | 2 +- plugins/provisioners/shell/provisioner.rb | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/guests/freebsd/config.rb b/plugins/guests/freebsd/config.rb index 0ad4cbccb..82d9863dc 100644 --- a/plugins/guests/freebsd/config.rb +++ b/plugins/guests/freebsd/config.rb @@ -1,6 +1,6 @@ module VagrantPlugins module GuestFreeBSD - class Config < Vagrant::Plugin::V1::Config + class Config < Vagrant.plugin("1", :config) attr_accessor :halt_timeout attr_accessor :halt_check_interval diff --git a/plugins/guests/linux/config.rb b/plugins/guests/linux/config.rb index 87e27739c..11b0b191a 100644 --- a/plugins/guests/linux/config.rb +++ b/plugins/guests/linux/config.rb @@ -1,6 +1,6 @@ module VagrantPlugins module GuestLinux - class Config < Vagrant::Plugin::V1::Config + class Config < Vagrant.plugin("1", :config) attr_accessor :halt_timeout attr_accessor :halt_check_interval diff --git a/plugins/guests/solaris/config.rb b/plugins/guests/solaris/config.rb index b47afc6db..f94459f5e 100644 --- a/plugins/guests/solaris/config.rb +++ b/plugins/guests/solaris/config.rb @@ -1,6 +1,6 @@ module VagrantPlugins module GuestSolaris - class Config < Vagrant::Plugin::V1::Config + class Config < Vagrant.plugin("1", :config) attr_accessor :halt_timeout attr_accessor :halt_check_interval # This sets the command to use to execute items as a superuser. sudo is default diff --git a/plugins/kernel_v1/config/nfs.rb b/plugins/kernel_v1/config/nfs.rb index 8d8546b83..56041ba1a 100644 --- a/plugins/kernel_v1/config/nfs.rb +++ b/plugins/kernel_v1/config/nfs.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module Kernel_V1 - class NFSConfig < Vagrant::Plugin::V1::Config + class NFSConfig < Vagrant.plugin("1", :config) attr_accessor :map_uid attr_accessor :map_gid end diff --git a/plugins/kernel_v1/config/package.rb b/plugins/kernel_v1/config/package.rb index 93b1f62c0..0f4c1d235 100644 --- a/plugins/kernel_v1/config/package.rb +++ b/plugins/kernel_v1/config/package.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module Kernel_V1 - class PackageConfig < Vagrant::Plugin::V1::Config + class PackageConfig < Vagrant.plugin("1", :config) attr_accessor :name end end diff --git a/plugins/kernel_v1/config/ssh.rb b/plugins/kernel_v1/config/ssh.rb index 5cf6f20e2..d6719a105 100644 --- a/plugins/kernel_v1/config/ssh.rb +++ b/plugins/kernel_v1/config/ssh.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module Kernel_V1 - class SSHConfig < Vagrant::Plugin::V1::Config + class SSHConfig < Vagrant.plugin("1", :config) attr_accessor :username attr_accessor :password attr_accessor :host diff --git a/plugins/kernel_v1/config/vagrant.rb b/plugins/kernel_v1/config/vagrant.rb index e74e69e49..ed3eee2c7 100644 --- a/plugins/kernel_v1/config/vagrant.rb +++ b/plugins/kernel_v1/config/vagrant.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module Kernel_V1 - class VagrantConfig < Vagrant::Plugin::V1::Config + class VagrantConfig < Vagrant.plugin("1", :config) attr_accessor :dotfile_name attr_accessor :host end diff --git a/plugins/kernel_v1/config/vm.rb b/plugins/kernel_v1/config/vm.rb index 7bb6d49ad..90de0014c 100644 --- a/plugins/kernel_v1/config/vm.rb +++ b/plugins/kernel_v1/config/vm.rb @@ -7,7 +7,7 @@ require File.expand_path("../vm_subvm", __FILE__) module VagrantPlugins module Kernel_V1 - class VMConfig < Vagrant::Plugin::V1::Config + class VMConfig < Vagrant.plugin("1", :config) DEFAULT_VM_NAME = :default attr_accessor :name diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb index 683071369..2264beca4 100644 --- a/plugins/provisioners/chef/provisioner/base.rb +++ b/plugins/provisioners/chef/provisioner/base.rb @@ -79,7 +79,7 @@ module VagrantPlugins end # This is the configuration which is available through `config.chef` - class Config < Vagrant::Plugin::V1::Config + class Config < Vagrant.plugin("1", :config) # Shared config attr_accessor :node_name attr_accessor :provisioning_path diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb index 4f1c2dfc9..afdcd74c7 100644 --- a/plugins/provisioners/puppet/provisioner/puppet.rb +++ b/plugins/provisioners/puppet/provisioner/puppet.rb @@ -8,7 +8,7 @@ module VagrantPlugins end class Puppet < Vagrant::Plugin::V1::Provisioner - class Config < Vagrant::Plugin::V1::Config + class Config < Vagrant.plugin("1", :config) attr_accessor :manifest_file attr_accessor :manifests_path attr_accessor :module_path diff --git a/plugins/provisioners/puppet/provisioner/puppet_server.rb b/plugins/provisioners/puppet/provisioner/puppet_server.rb index bc59eb995..0fdba7eb0 100644 --- a/plugins/provisioners/puppet/provisioner/puppet_server.rb +++ b/plugins/provisioners/puppet/provisioner/puppet_server.rb @@ -6,7 +6,7 @@ module VagrantPlugins end class PuppetServer < Vagrant::Plugin::V1::Provisioner - class Config < Vagrant::Plugin::V1::Config + class Config < Vagrant.plugin("1", :config) attr_accessor :puppet_server attr_accessor :puppet_node attr_accessor :options diff --git a/plugins/provisioners/shell/provisioner.rb b/plugins/provisioners/shell/provisioner.rb index 00e4301b0..7f0bc3bfd 100644 --- a/plugins/provisioners/shell/provisioner.rb +++ b/plugins/provisioners/shell/provisioner.rb @@ -4,7 +4,7 @@ require "tempfile" module VagrantPlugins module Shell class Provisioner < Vagrant::Plugin::V1::Provisioner - class Config < Vagrant::Plugin::V1::Config + class Config < Vagrant.plugin("1", :config) attr_accessor :inline attr_accessor :path attr_accessor :upload_path