diff options
| author | Monty Taylor <mordred@inaugust.com> | 2015-05-29 07:06:15 -0400 |
|---|---|---|
| committer | Greg DeKoenigsberg <greg@eucalyptus.com> | 2015-06-16 11:33:12 -0400 |
| commit | e7ed08f762188244406e5fe1252c34ee64dcbfe7 (patch) | |
| tree | e47bbce387df7bb92800a48c4139b96f608dbf23 /system/puppet.py | |
| parent | a1ecd60285c91466577463069a8cf9c6739813b1 (diff) | |
| download | ansible-modules-extras-e7ed08f762188244406e5fe1252c34ee64dcbfe7.tar.gz | |
Add support for check mode
Diffstat (limited to 'system/puppet.py')
| -rw-r--r-- | system/puppet.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/system/puppet.py b/system/puppet.py index 57c76eee..d6bc4348 100644 --- a/system/puppet.py +++ b/system/puppet.py @@ -99,6 +99,7 @@ def main(): facts=dict(default=None), facter_basename=dict(default='ansible'), ), + supports_check_mode=True, required_one_of=[ ('puppetmaster', 'manifest'), ], @@ -129,7 +130,7 @@ def main(): module.fail_json( msg="Puppet agent state could not be determined.") - if module.params['facts']: + if module.params['facts'] and not module.check_mode: _write_structured_data( _get_facter_dir(), module.params['facter_basename'], @@ -139,7 +140,7 @@ def main(): timeout=pipes.quote(p['timeout']), puppet_cmd=PUPPET_CMD) if p['puppetmaster']: - cmd = ("%(base_cmd) agent --onetime" + cmd = ("%(base_cmd)s agent --onetime" " --server %(puppetmaster)s" " --ignorecache --no-daemonize --no-usecacheonfailure --no-splay" " --detailed-exitcodes --verbose") % dict( @@ -147,10 +148,13 @@ def main(): puppetmaster=pipes.quote(p['puppetmaster'])) if p['show_diff']: cmd += " --show-diff" + if module.check_mode: + cmd += " --noop" else: - cmd = ("%(base_cmd) apply --detailed-exitcodes %(manifest)s" % dict( - base_cmd=base_cmd, - manifest=pipes.quote(p['manifest']))) + cmd = "%s apply --detailed-exitcodes " % base_cmd + if module.check_mode: + cmd += "--noop " + cmd += pipes.quote(p['manifest']) rc, stdout, stderr = module.run_command(cmd) if rc == 0: |