From 2affb5f729d38d233f9226ca4ee29c9349ade276 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Thu, 24 May 2018 14:54:07 -0400 Subject: [PATCH] doc fix --- lib/ansible/cli/doc.py | 2 ++ lib/ansible/plugins/lookup/_redis_kv.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py index ef158facd8e..e7bc8485904 100644 --- a/lib/ansible/cli/doc.py +++ b/lib/ansible/cli/doc.py @@ -537,6 +537,8 @@ class DocCLI(CLI): if 'deprecated' in doc and doc['deprecated'] is not None and len(doc['deprecated']) > 0: text.append("DEPRECATED: \n") if isinstance(doc['deprecated'], dict): + if 'version' in doc['deprecated'] and 'removed_in' not in doc['deprecated']: + doc['deprecated']['removed_in'] = doc['deprecated']['version'] text.append("\tReason: %(why)s\n\tWill be removed in: Ansible %(removed_in)s\n\tAlternatives: %(alternative)s" % doc.pop('deprecated')) else: text.append("%s" % doc.pop('deprecated')) diff --git a/lib/ansible/plugins/lookup/_redis_kv.py b/lib/ansible/plugins/lookup/_redis_kv.py index d3ce9d62664..fae1fb653bb 100644 --- a/lib/ansible/plugins/lookup/_redis_kv.py +++ b/lib/ansible/plugins/lookup/_redis_kv.py @@ -11,7 +11,7 @@ DOCUMENTATION = """ short_description: fetch data from Redis deprecated: why: This lookup uses options intermingled with terms which blurs the interface between settings and data - removed_in: '2.9' + version: '2.9' alternative: new 'redis' lookup description: - this lookup returns a list of items given to it, if any of the top level items is also a list it will flatten it, but it will not recurse