From 4093e790274e8e34be6b504ce286c9d79f01c280 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 21 Dec 2011 23:27:43 -0800 Subject: [PATCH] Removed deprecation notice for chef_server to chef_client --- lib/vagrant/config/vm.rb | 7 +------ templates/locales/en.yml | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/vagrant/config/vm.rb b/lib/vagrant/config/vm.rb index 92e3cb29e69..ed160a52e67 100644 --- a/lib/vagrant/config/vm.rb +++ b/lib/vagrant/config/vm.rb @@ -146,12 +146,7 @@ def validate(env, errors) # Each provisioner can validate itself provisioners.each do |prov| - # TODO: Remove at some point - if prov.shortcut == :chef_server - errors.add(I18n.t("vagrant.config.vm.provisioner_chef_server_changed")) - else - prov.validate(env, errors) - end + prov.validate(env, errors) end end end diff --git a/templates/locales/en.yml b/templates/locales/en.yml index fdec49ede03..d393c35fa4f 100644 --- a/templates/locales/en.yml +++ b/templates/locales/en.yml @@ -201,7 +201,6 @@ en: shared_folder_hostpath_missing: "Shared folder host path for '%{name}' doesn't exist: %{path}" shared_folder_nfs_owner_group: |- Shared folder '%{name}': NFS does not support the owner/group settings. - provisioner_chef_server_changed: "The provisioner 'chef_server' is now 'chef_client'" provisioner_not_found: "The provisioner '%{shortcut}' doesn't exist." provisioner_invalid_class: "The provisioner '%{shortcut}' must inherit from `Vagrant::Provisioners::Base`."