opendev/ansible-role-puppet
Code Issues Proposed changes

Don't set detailed-exitcodes when noop

Browse Source 
Change-Id: I3819ad5920a0a88b0b52ecb9b77a58c6d588fbdc
This commit is contained in:
James E. Blair 2016-09-16 15:37:27 -07:00 committed by Monty Taylor
parent fccf47a713
commit e8632f41a4
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/puppet
View File

@ -193,13 +193,13 @@ def main():
if not p['manifest']: if not p['manifest']:
cmd = ("%(base_cmd)s agent --onetime" cmd = ("%(base_cmd)s agent --onetime"
" --ignorecache --no-daemonize --no-usecacheonfailure" " --ignorecache --no-daemonize --no-usecacheonfailure"
" --no-splay --detailed-exitcodes --verbose") % dict( " --no-splay --verbose") % dict(
base_cmd=base_cmd, base_cmd=base_cmd,
) )
if p['puppetmaster']: if p['puppetmaster']:
cmd += " --server %s" % pipes.quote(p['puppetmaster']) cmd += " --server %s" % pipes.quote(p['puppetmaster'])
else: else:
cmd = "%s apply --detailed-exitcodes " % base_cmd cmd = "%s apply " % base_cmd
cmd += pipes.quote(p['manifest']) cmd += pipes.quote(p['manifest'])
if p['logdest'] != 'stdout': if p['logdest'] != 'stdout':
cmd += " --logdest %s" % p['logdest'] cmd += " --logdest %s" % p['logdest']
@ -208,9 +208,12 @@ def main():
if p['environment']: if p['environment']:
cmd += " --environment '%s'" % p['environment'] cmd += " --environment '%s'" % p['environment']
if module.check_mode or p['noop']: if module.check_mode or p['noop']:
# Noop causes detailed-exitcodes to sometimes erroneously
# return failures, so we only set detailed-exitcodes when
# running for real.
cmd += " --noop" cmd += " --noop"
else: else:
cmd += " --no-noop" cmd += " --no-noop --detailed-exitcodes"
if p['debug']: if p['debug']:
cmd += " --debug" cmd += " --debug"
rc, stdout, stderr = module.run_command(cmd) rc, stdout, stderr = module.run_command(cmd)