Allow any logdest
Puppet's logdest option can also point to a file, so allow any string through here. Change-Id: I36fc99fa7e6169463acd24a5a6f4b54cf23849b7
This commit is contained in:
parent
e46f449ca5
commit
1a20bc89eb
@ -72,7 +72,6 @@ options:
|
||||
- Where the puppet logs should go, if puppet apply is being used
|
||||
required: false
|
||||
default: stdout
|
||||
choices: [ 'stdout', 'syslog' ]
|
||||
version_added: "2.1"
|
||||
requirements: [ puppet ]
|
||||
author: "Monty Taylor (@emonty)"
|
||||
@ -119,8 +118,7 @@ def main():
|
||||
puppetmaster=dict(required=False, default=None),
|
||||
manifest=dict(required=False, default=None),
|
||||
logdest=dict(
|
||||
required=False, default='stdout',
|
||||
choices=['stdout', 'syslog']),
|
||||
required=False, default='stdout'),
|
||||
show_diff=dict(
|
||||
# internal code to work with --diff, do not use
|
||||
default=False, aliases=['show-diff'], type='bool'),
|
||||
@ -195,10 +193,10 @@ def main():
|
||||
cmd += " --no-noop"
|
||||
else:
|
||||
cmd = "%s apply --detailed-exitcodes " % base_cmd
|
||||
if p['logdest'] == 'syslog':
|
||||
cmd += "--logdest syslog "
|
||||
if p['show_diff']:
|
||||
cmd += "--show_diff "
|
||||
if p['logdest'] != 'stdout':
|
||||
cmd += "--logdest %s " % p['logdest']
|
||||
if p['environment']:
|
||||
cmd += "--environment '%s' " % p['environment']
|
||||
if module.check_mode:
|
||||
|
Loading…
x
Reference in New Issue
Block a user