Add basemodulepath to the Puppet mcagent
This parameter is required for Puppet 4 to be able to find the base modules without any environment defined. Puppet 3 is able to work in the legacy mode without the environment support and does not case if there is base module path or not. Closes-Bug: 1655663 Change-Id: I60f2c78ef5fe366314eea186f4671d198e54f1d6
This commit is contained in:
parent
2505ab1d8e
commit
1c1578b64a
|
@ -200,12 +200,15 @@ module MCollective
|
||||||
rm_file(@last_report)
|
rm_file(@last_report)
|
||||||
rm_file(@last_summary)
|
rm_file(@last_summary)
|
||||||
cwd = request.fetch(:cwd, '/')
|
cwd = request.fetch(:cwd, '/')
|
||||||
|
manifest = request.fetch(:manifest, '/etc/puppet/manifests/site.pp')
|
||||||
|
module_path = request.fetch(:modules, '/etc/puppet/modules')
|
||||||
cmd = [
|
cmd = [
|
||||||
@puppetd,
|
@puppetd,
|
||||||
"-c #{cwd}",
|
"-c #{cwd}",
|
||||||
@puppetd_agent,
|
@puppetd_agent,
|
||||||
request.fetch(:manifest, '/etc/puppet/manifests/site.pp'),
|
manifest,
|
||||||
"--modulepath=#{request.fetch(:modules, '/etc/puppet/modules')}",
|
'--modulepath', module_path,
|
||||||
|
'--basemodulepath', module_path,
|
||||||
'--logdest', 'syslog',
|
'--logdest', 'syslog',
|
||||||
'--trace',
|
'--trace',
|
||||||
'--reports', 'none',
|
'--reports', 'none',
|
||||||
|
|
Loading…
Reference in New Issue