wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport/2.7/46044 Make puppet module useable on puppet 6 (#48871)

Browse source 
* Make puppet module useable on puppet 6 (#46044)

The unused ignorecache setting has been removed and so you
can't run puppet through this module anymore.

See PUP-8533 / https://tickets.puppetlabs.com/browse/PUP-8533
(cherry picked from commit 475d69da69)

* changelog
This commit is contained in:
John R Barker 2018-11-19 18:17:00 +00:00 committed by Toshio Kuratomi
parent 51a3d60991
commit 6b3619da9e
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/46044-puppet-puppet6-fix.yaml Normal file
View file

@ -0,0 +1,2 @@
minor_changes:
- Puppet module remove ``--ignorecache`` to allow Puppet 6 support

2
lib/ansible/modules/system/puppet.py
View file

@ -216,7 +216,7 @@ def main():
if not p['manifest'] and not p['execute']: if not p['manifest'] and not p['execute']:
cmd = ("%(base_cmd)s agent --onetime" cmd = ("%(base_cmd)s agent --onetime"
" --ignorecache --no-daemonize --no-usecacheonfailure --no-splay" " --no-daemonize --no-usecacheonfailure --no-splay"
" --detailed-exitcodes --verbose --color 0") % dict(base_cmd=base_cmd) " --detailed-exitcodes --verbose --color 0") % dict(base_cmd=base_cmd)
if p['puppetmaster']: if p['puppetmaster']:
cmd += " --server %s" % pipes.quote(p['puppetmaster']) cmd += " --server %s" % pipes.quote(p['puppetmaster'])