From 26a96c72b263a8e2eda20267d0f1196662875bff Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Thu, 6 Sep 2018 16:27:59 -0400 Subject: [PATCH] Fix callback config typos (#45316) * plugins/callbacks : fix some key documentation (#45267) These are supposed to be a dictionary with section/key entries; correct a few typos. (cherry picked from commit c34e0f5e111e693902a2d88b49b199b4e2bf5a2a) * backport of #45267 --- changelogs/fragments/cb_fix_config.yml | 2 ++ lib/ansible/plugins/callback/hipchat.py | 10 +++++----- lib/ansible/plugins/callback/selective.py | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 changelogs/fragments/cb_fix_config.yml diff --git a/changelogs/fragments/cb_fix_config.yml b/changelogs/fragments/cb_fix_config.yml new file mode 100644 index 00000000000..f064f71acf3 --- /dev/null +++ b/changelogs/fragments/cb_fix_config.yml @@ -0,0 +1,2 @@ +bugfixes: + - fixed typo in config that prevented keys matching diff --git a/lib/ansible/plugins/callback/hipchat.py b/lib/ansible/plugins/callback/hipchat.py index c0aa12405a3..352c2e1294c 100644 --- a/lib/ansible/plugins/callback/hipchat.py +++ b/lib/ansible/plugins/callback/hipchat.py @@ -24,7 +24,7 @@ DOCUMENTATION = ''' - name: HIPCHAT_TOKEN ini: - section: callback_hipchat - - key: token + key: token api_version: description: HipChat API version, v1 or v2. required: False @@ -33,7 +33,7 @@ DOCUMENTATION = ''' - name: HIPCHAT_API_VERSION ini: - section: callback_hipchat - - key: api_version + key: api_version room: description: HipChat room to post in. default: ansible @@ -41,7 +41,7 @@ DOCUMENTATION = ''' - name: HIPCHAT_ROOM ini: - section: callback_hipchat - - key: room + key: room from: description: Name to post as default: ansible @@ -49,7 +49,7 @@ DOCUMENTATION = ''' - name: HIPCHAT_FROM ini: - section: callback_hipchat - - key: from + key: from notify: description: Add notify flag to important messages type: bool @@ -58,7 +58,7 @@ DOCUMENTATION = ''' - name: HIPCHAT_NOTIFY ini: - section: callback_hipchat - - key: notify + key: notify ''' diff --git a/lib/ansible/plugins/callback/selective.py b/lib/ansible/plugins/callback/selective.py index 3535a460305..580d69b18ef 100644 --- a/lib/ansible/plugins/callback/selective.py +++ b/lib/ansible/plugins/callback/selective.py @@ -26,7 +26,7 @@ DOCUMENTATION = """ - name: ANSIBLE_SELECTIVE_DONT_COLORIZE ini: - section: defaults - - key: nocolor + key: nocolor type: boolean """