openstack
/
fuel-astute
Code Issues Proposed changes

Merge "Add basemodulepath to the Puppet mcagent"

This commit is contained in:
Jenkins 2017-01-13 17:14:12 +00:00 committed by Gerrit Code Review
parent 0b9c778325 1c1578b64a
commit 6eea2344d7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mcagents/puppetd.rb
View File

@ -200,12 +200,15 @@ module MCollective
rm_file(@last_report)
rm_file(@last_summary)
cwd = request.fetch(:cwd, '/')
manifest = request.fetch(:manifest, '/etc/puppet/manifests/site.pp')
module_path = request.fetch(:modules, '/etc/puppet/modules')
cmd = [
@puppetd,
"-c #{cwd}",
@puppetd_agent,
request.fetch(:manifest, '/etc/puppet/manifests/site.pp'),
"--modulepath=#{request.fetch(:modules, '/etc/puppet/modules')}",
manifest,
'--modulepath', module_path,
'--basemodulepath', module_path,
'--logdest', 'syslog',
'--trace',
'--reports', 'none',