opendev/ansible-role-puppet
Code Issues Proposed changes

Allow any logdest

Browse Source 
Puppet's logdest option can also point to a file, so allow any
string through here.

Change-Id: I36fc99fa7e6169463acd24a5a6f4b54cf23849b7
This commit is contained in:
James E. Blair 2016-09-16 12:34:08 -07:00 committed by Monty Taylor
parent e46f449ca5
commit 1a20bc89eb
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/puppet
View File

@ -72,7 +72,6 @@ options:
- Where the puppet logs should go, if puppet apply is being used - Where the puppet logs should go, if puppet apply is being used
required: false required: false
default: stdout default: stdout
choices: [ 'stdout', 'syslog' ]
version_added: "2.1" version_added: "2.1"
requirements: [ puppet ] requirements: [ puppet ]
author: "Monty Taylor (@emonty)" author: "Monty Taylor (@emonty)"
@ -119,8 +118,7 @@ def main():
puppetmaster=dict(required=False, default=None), puppetmaster=dict(required=False, default=None),
manifest=dict(required=False, default=None), manifest=dict(required=False, default=None),
logdest=dict( logdest=dict(
required=False, default='stdout', required=False, default='stdout'),
choices=['stdout', 'syslog']),
show_diff=dict( show_diff=dict(
# internal code to work with --diff, do not use # internal code to work with --diff, do not use
default=False, aliases=['show-diff'], type='bool'), default=False, aliases=['show-diff'], type='bool'),
@ -195,10 +193,10 @@ def main():
cmd += " --no-noop" cmd += " --no-noop"
else: else:
cmd = "%s apply --detailed-exitcodes " % base_cmd cmd = "%s apply --detailed-exitcodes " % base_cmd
if p['logdest'] == 'syslog':
cmd += "--logdest syslog "
if p['show_diff']: if p['show_diff']:
cmd += "--show_diff " cmd += "--show_diff "
if p['logdest'] != 'stdout':
cmd += "--logdest %s " % p['logdest']
if p['environment']: if p['environment']:
cmd += "--environment '%s' " % p['environment'] cmd += "--environment '%s' " % p['environment']
if module.check_mode: if module.check_mode: