haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't parse env metadata until provisioning time. TBD: make it functional

This commit is contained in:
Ben Hines 2015-04-12 01:18:49 -07:00
parent 3ee47acb42
commit 7a4e7929f8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/provisioners/puppet/provisioner/puppet.rb
View File

@ -39,7 +39,6 @@ module VagrantPlugins
File.expand_path(@config.environment_path[1], root_path), File.expand_path(@config.environment_path[1], root_path),
environments_guest_path, folder_opts) environments_guest_path, folder_opts)
end end
parse_environment_metadata()
else else
# Non-Environment mode # Non-Environment mode
@manifest_file = File.join(manifests_guest_path, @config.manifest_file) @manifest_file = File.join(manifests_guest_path, @config.manifest_file)
@ -114,6 +113,7 @@ module VagrantPlugins
@machine.communicate.upload(local_hiera_path, @hiera_config_path) @machine.communicate.upload(local_hiera_path, @hiera_config_path)
end end
parse_environment_metadata
run_puppet_apply run_puppet_apply
end end