lib/vagrant-invade/action/validate.rb in vagrant-invade-0.4.0.pre.alpha vs lib/vagrant-invade/action/validate.rb in vagrant-invade-0.4.0
- old
+ new
@@ -99,12 +99,14 @@
case type
when 'shell'
provision = Validator::Provision::Shell.new(env, provision).validate
when 'shellinline', 'shell-inline'
provision = Validator::Provision::ShellInline.new(env, provision).validate
- when 'puppet'
- provision = Validator::Provision::Puppet.new(env, provision).validate
+ when 'puppet', 'puppetapply', 'puppet-apply'
+ provision = Validator::Provision::PuppetApply.new(env, provision).validate
+ when 'puppet-agent', 'puppetagent', 'puppet-server', 'puppet-master'
+ provision = Validator::Provision::PuppetAgent.new(env, provision).validate
else
raise StandardError, "Provision type unknown or not set. Please check configuration file."
end
end
end
@@ -135,11 +137,11 @@
end
end
end
- if Validator::VALIDATION_ERRORS > 0
- @env[:ui].warn('[Invade] Configuration has validation warnings. Use debug mode to see details.') unless quiet
+ if Validator.get_validation_errors > 0
+ @env[:ui].warn('[Invade] Configuration has validation warnings. Run \'vagrant invade validate\' to see details.')
else
@env[:ui].success('[Invade] Configuration validated successfully.')
end
@app.call(env)