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

Correct default path to facter and indentaion

This commit is contained in:
Ben Hines 2015-07-15 16:52:00 -07:00
parent 770d927ba1
commit bfb66f3166
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,16 +124,16 @@ module VagrantPlugins
# Build up the structured custom facts if we have any # Build up the structured custom facts if we have any
# With structured facts on, we assume the config.facter is yaml. # With structured facts on, we assume the config.facter is yaml.
if config.structured_facts && !config.facter.empty? if config.structured_facts && !config.facter.empty?
@facter_config_path = "/etc/facter/facts.d/vagrant_facts.yaml" @facter_config_path = "/etc/puppetlabs/facter/facts.d/vagrant_facts.yaml"
if windows? if windows?
@facter_config_path = "/ProgramData/PuppetLabs/facter/facts.d/vagrant_facts.yaml" @facter_config_path = "/ProgramData/PuppetLabs/facter/facts.d/vagrant_facts.yaml"
end end
t = Tempfile.new("vagrant_facts.yaml") t = Tempfile.new("vagrant_facts.yaml")
t.write(config.facter) t.write(config.facter)
t.close() t.close()
@machine.communicate.upload(t.path, @facter_config_path) @machine.communicate.upload(t.path, @facter_config_path)
end end
run_puppet_apply run_puppet_apply
end end