From 6b3619da9e270a93017a2956982b0a4a4bf4aca0 Mon Sep 17 00:00:00 2001 From: John R Barker Date: Mon, 19 Nov 2018 18:17:00 +0000 Subject: [PATCH] Backport/2.7/46044 Make puppet module useable on puppet 6 (#48871) * 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 475d69da69d81947c61b47902d198c40e3c72dce) * changelog --- changelogs/fragments/46044-puppet-puppet6-fix.yaml | 2 ++ lib/ansible/modules/system/puppet.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/46044-puppet-puppet6-fix.yaml diff --git a/changelogs/fragments/46044-puppet-puppet6-fix.yaml b/changelogs/fragments/46044-puppet-puppet6-fix.yaml new file mode 100644 index 00000000000..074f1aa94b1 --- /dev/null +++ b/changelogs/fragments/46044-puppet-puppet6-fix.yaml @@ -0,0 +1,2 @@ +minor_changes: +- Puppet module remove ``--ignorecache`` to allow Puppet 6 support diff --git a/lib/ansible/modules/system/puppet.py b/lib/ansible/modules/system/puppet.py index ddd0dd7c4cb..cbd3c34173e 100644 --- a/lib/ansible/modules/system/puppet.py +++ b/lib/ansible/modules/system/puppet.py @@ -216,7 +216,7 @@ def main(): if not p['manifest'] and not p['execute']: 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) if p['puppetmaster']: cmd += " --server %s" % pipes.quote(p['puppetmaster'])