ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

puppet - replace stdout with console in logdest option (#2407) (#2420)

Browse source 
* Change stdout to console

* readd stdout, resulting in console

* add changelog

* readd stdout to docs and add a warning when it is used

* version of what???

Co-authored-by: Felix Fontein <felix@fontein.de>

* postpone deprecation in another PR

* remove console option, so it can be backported

* change changelog respectively

* Fix changelog formatting

Co-authored-by: Felix Fontein <felix@fontein.de>

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 26aba8e766)

Co-authored-by: Amin Vakil <info@aminvakil.com>
This commit is contained in:
patchback[bot] 2021-05-03 07:59:30 +02:00 committed by GitHub
parent b2f01f4c20
commit ca0b1efa5b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/2407-puppet-change_stdout_to_console.yaml Normal file
View file

@ -0,0 +1,3 @@
---
bugfixes:
- puppet - replace ``console` with ``stdout`` in ``logdest`` option when ``all`` has been chosen (https://github.com/ansible-collections/community.general/issues/1190).

7
plugins/modules/system/puppet.py
View file

@ -54,7 +54,8 @@ options:
logdest: logdest:
description: description:
- Where the puppet logs should go, if puppet apply is being used. - Where the puppet logs should go, if puppet apply is being used.
- C(all) will go to both C(stdout) and C(syslog). - C(all) will go to both C(console) and C(syslog).
- C(stdout) will be deprecated and replaced by C(console).
type: str type: str
choices: [ all, stdout, syslog ] choices: [ all, stdout, syslog ]
default: stdout default: stdout
@ -127,7 +128,7 @@ EXAMPLES = r'''
community.general.puppet: community.general.puppet:
noop: yes noop: yes
- name: Run a manifest with debug, log to both syslog and stdout, specify module path - name: Run a manifest with debug, log to both syslog and console, specify module path
community.general.puppet: community.general.puppet:
modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules modulepath: /etc/puppet/modules:/opt/stack/puppet-modules:/usr/share/openstack-puppet/modules
logdest: all logdest: all
@ -269,7 +270,7 @@ def main():
if p['logdest'] == 'syslog': if p['logdest'] == 'syslog':
cmd += "--logdest syslog " cmd += "--logdest syslog "
if p['logdest'] == 'all': if p['logdest'] == 'all':
cmd += " --logdest syslog --logdest stdout" cmd += " --logdest syslog --logdest console"
if p['modulepath']: if p['modulepath']:
cmd += "--modulepath='%s'" % p['modulepath'] cmd += "--modulepath='%s'" % p['modulepath']
if p['environment']: if p['environment']: