provisioners/all: report proper invalid keys [GH-2117]

This commit is contained in:
Mitchell Hashimoto 2013-09-04 16:56:45 -07:00
parent d5f733b184
commit f82711259c
7 changed files with 7 additions and 6 deletions

View File

@ -89,6 +89,7 @@ BUG FIXES:
network adapters. [GH-1886]
- provisioners/ansible: Execute ansible with a cwd equal to the
path where the Vagrantfile is. [GH-2051]
- provisioners/all: invalid config keys will be properly reported. [GH-2117]
- provisioners/ansible: No longer report failure on every run. [GH-2007]
- provisioners/ansible: Properly handle extra vars with spaces. [GH-1984]
- provisioners/chef: Formatter option works properly. [GH-2058]

View File

@ -47,7 +47,7 @@ module VagrantPlugins
end
def validate(machine)
errors = []
errors = _detected_errors
# Validate that a playbook path was provided
if !playbook

View File

@ -90,7 +90,7 @@ module VagrantPlugins
end
def validate(machine)
errors = []
errors = _detected_errors
valid_modes = [:bootstrap, :single_run]
errors << I18n.t("vagrant.cfengine_config.invalid_mode") if !valid_modes.include?(@mode)

View File

@ -87,7 +87,7 @@ module VagrantPlugins
# it returns an array of errors that should be merged into some
# other error accumulator.
def validate_base(machine)
errors = []
errors = _detected_errors
if @custom_config_path
expanded = File.expand_path(@custom_config_path, machine.env.root_path)

View File

@ -7,7 +7,7 @@ module VagrantPlugins
attr_accessor :destination
def validate(machine)
errors = []
errors = _detected_errors
if !source
errors << I18n.t("vagrant.provisioners.file.no_source_file")
end

View File

@ -59,7 +59,7 @@ module VagrantPlugins
end
def validate(machine)
errors = []
errors = _detected_errors
# Calculate the manifests and module paths based on env
this_expanded_manifests_path = expanded_manifests_path(machine.env.root_path)

View File

@ -79,7 +79,7 @@ module VagrantPlugins
end
def validate(machine)
errors = []
errors = _detected_errors
if @minion_key || @minion_pub
if !@minion_key || !@minion_pub
errors << @minion_pub