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

Merge pull request #1015 from jamtur01/updatedpuppetcommands 

This commit has three minor changes to the Puppet provisioners
This commit is contained in:
Mitchell Hashimoto 2012-07-11 11:04:53 -07:00
parent 61621369d2 97420a990a
commit 25800c752a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,7 @@ module VagrantPlugins
# Verify Puppet is installed and run it
verify_binary("puppet")
run_puppet_client
run_puppet_apply
end
def share_manifests
@ -135,7 +135,7 @@ module VagrantPlugins
:binary => binary)
end
def run_puppet_client
def run_puppet_apply
options = [config.options].flatten
module_paths = @module_paths.map { |_, to| to }
options << "--modulepath '#{module_paths.join(':')}'" if !@module_paths.empty?

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

@ -22,8 +22,8 @@ module VagrantPlugins
end
def provision!
verify_binary("puppetd")
run_puppetd_client
verify_binary("puppet")
run_puppet_agent
end
def verify_binary(binary)
@ -33,7 +33,7 @@ module VagrantPlugins
:binary => binary)
end
def run_puppetd_client
def run_puppet_agent
options = config.options
options = [options] if !options.is_a?(Array)
@ -67,7 +67,7 @@ module VagrantPlugins
facter = "#{facts.join(" ")} "
end
command = "#{facter}puppetd #{options} --server #{config.puppet_server}"
command = "#{facter}puppet agent #{options} --server #{config.puppet_server}"
env[:ui].info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
env[:vm].channel.sudo(command) do |type, data|