diff --git a/plugins/provisioners/chef/plugin.rb b/plugins/provisioners/chef/plugin.rb index d4a8bd69c..8e08af5d2 100644 --- a/plugins/provisioners/chef/plugin.rb +++ b/plugins/provisioners/chef/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module Chef - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "chef" description <<-DESC Provides support for provisioning your virtual machines with diff --git a/plugins/provisioners/chef/provisioner/base.rb b/plugins/provisioners/chef/provisioner/base.rb index fcbfb3045..c30a82ff4 100644 --- a/plugins/provisioners/chef/provisioner/base.rb +++ b/plugins/provisioners/chef/provisioner/base.rb @@ -8,7 +8,7 @@ module VagrantPlugins # This class is a base class where the common functionality shared between # chef-solo and chef-client provisioning are stored. This is **not an actual # provisioner**. Instead, {ChefSolo} or {ChefServer} should be used. - class Base < Vagrant.plugin("1", :provisioner) + class Base < Vagrant.plugin("2", :provisioner) include Vagrant::Util::Counter def initialize(env, config) @@ -85,7 +85,7 @@ module VagrantPlugins end # This is the configuration which is available through `config.chef` - class Config < Vagrant.plugin("1", :config) + class Config < Vagrant.plugin("2", :config) # Shared config attr_accessor :node_name attr_accessor :provisioning_path diff --git a/plugins/provisioners/puppet/plugin.rb b/plugins/provisioners/puppet/plugin.rb index 68aefceca..036ff5e00 100644 --- a/plugins/provisioners/puppet/plugin.rb +++ b/plugins/provisioners/puppet/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module Puppet - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "puppet" description <<-DESC Provides support for provisioning your virtual machines with diff --git a/plugins/provisioners/puppet/provisioner/puppet.rb b/plugins/provisioners/puppet/provisioner/puppet.rb index 164241608..78c7ca519 100644 --- a/plugins/provisioners/puppet/provisioner/puppet.rb +++ b/plugins/provisioners/puppet/provisioner/puppet.rb @@ -7,8 +7,8 @@ module VagrantPlugins error_namespace("vagrant.provisioners.puppet") end - class Puppet < Vagrant.plugin("1", :provisioner) - class Config < Vagrant.plugin("1", :config) + class Puppet < Vagrant.plugin("2", :provisioner) + class Config < Vagrant.plugin("2", :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 3c345b885..3383b88f1 100644 --- a/plugins/provisioners/puppet/provisioner/puppet_server.rb +++ b/plugins/provisioners/puppet/provisioner/puppet_server.rb @@ -5,8 +5,8 @@ module VagrantPlugins error_namespace("vagrant.provisioners.puppet_server") end - class PuppetServer < Vagrant.plugin("1", :provisioner) - class Config < Vagrant.plugin("1", :config) + class PuppetServer < Vagrant.plugin("2", :provisioner) + class Config < Vagrant.plugin("2", :config) attr_accessor :puppet_server attr_accessor :puppet_node attr_accessor :options diff --git a/plugins/provisioners/shell/plugin.rb b/plugins/provisioners/shell/plugin.rb index a36f3ed78..b88ec5630 100644 --- a/plugins/provisioners/shell/plugin.rb +++ b/plugins/provisioners/shell/plugin.rb @@ -2,7 +2,7 @@ require "vagrant" module VagrantPlugins module Shell - class Plugin < Vagrant.plugin("1") + class Plugin < Vagrant.plugin("2") name "shell" description <<-DESC Provides support for provisioning your virtual machines with diff --git a/plugins/provisioners/shell/provisioner.rb b/plugins/provisioners/shell/provisioner.rb index 157a683fe..c29ac1da6 100644 --- a/plugins/provisioners/shell/provisioner.rb +++ b/plugins/provisioners/shell/provisioner.rb @@ -3,8 +3,8 @@ require "tempfile" module VagrantPlugins module Shell - class Provisioner < Vagrant.plugin("1", :provisioner) - class Config < Vagrant.plugin("1", :config) + class Provisioner < Vagrant.plugin("2", :provisioner) + class Config < Vagrant.plugin("2", :config) attr_accessor :inline attr_accessor :path attr_accessor :upload_path