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

Allow passing options to the Puppet provisioner 

This allows for instance to pass the --modulepath options like this:

config.vm.puppet.options = ["--modulepath","modules"]

Which would call puppet with "--modulepath modules".

Signed-off-by: Brice Figureau <brice@daysofwonder.com>
This commit is contained in:
Brice Figureau 2010-12-12 18:20:48 +01:00 committed by Mitchell Hashimoto
parent d0add468ac
commit 6b46949550
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vagrant/provisioners/puppet.rb
View File

@ -11,11 +11,13 @@ module Vagrant
attr_accessor :manifest_file
attr_accessor :manifests_path
attr_accessor :pp_path
attr_accessor :options
def initialize
@manifest_file = ""
@manifests_path = "manifests"
@pp_path = "/tmp/vagrant-puppet"
@options = []
end
end
@ -66,7 +68,7 @@ module Vagrant
end
def run_puppet_client
command = "cd #{env.config.puppet.pp_path} && sudo -E puppet #{@manifest}"
command = "cd #{env.config.puppet.pp_path} && sudo -E puppet #{env.config.puppet.options.join(" ")} #{@manifest}"
env.ui.info I18n.t("vagrant.provisioners.puppet.running_puppet")

8
test/vagrant/provisioners/puppet_test.rb
View File

@ -110,7 +110,13 @@ class PuppetProvisionerTest < Test::Unit::TestCase
end
should "cd into the pp_path directory and run puppet" do
@ssh.expects(:exec!).with("cd #{@env.config.puppet.pp_path} && sudo -E puppet #{@manifest}").once
@ssh.expects(:exec!).with("cd #{@env.config.puppet.pp_path} && sudo -E puppet #{@manifest}").once
@action.run_puppet_client
end
should "cd into the pp_path directory and run puppet with given options" do
@env.config.puppet.options = ["--modulepath", "modules", "--verbose"]
@ssh.expects(:exec!).with("cd #{@env.config.puppet.pp_path} && sudo -E puppet --modulepath modules --verbose #{@manifest}").once
@action.run_puppet_client
end