summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorBrian Coca <bcoca@users.noreply.github.com>2018-12-10 17:37:15 +0100
committerGitHub <noreply@github.com>2018-12-10 17:37:15 +0100
commit20270680fc61fc70ae1cdb27a5d8642d14549bfa (patch)
tree7b66bbf694bd56ac9bba429fcf039e59150e2f87 /packaging
parentPull documentation of ansible.module_utils.basic from (improved) doc strings.... (diff)
downloadansible-20270680fc61fc70ae1cdb27a5d8642d14549bfa.tar.xz
ansible-20270680fc61fc70ae1cdb27a5d8642d14549bfa.zip
fixes to ansible-doc (#47682)
fixes to ansible-doc - change json to always be type dependent - change changelog generation to loop over the options - warn about ignoring module path
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/release/changelogs/changelog.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/packaging/release/changelogs/changelog.py b/packaging/release/changelogs/changelog.py
index c11ceab222..dcaedbb7b1 100755
--- a/packaging/release/changelogs/changelog.py
+++ b/packaging/release/changelogs/changelog.py
@@ -24,6 +24,8 @@ try:
except ImportError:
argcomplete = None
+from ansible import constants as C
+
BASE_DIR = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..'))
CHANGELOG_DIR = os.path.join(BASE_DIR, 'changelogs')
CONFIG_PATH = os.path.join(CHANGELOG_DIR, 'config.yaml')
@@ -173,7 +175,9 @@ def load_plugins(version, force_reload):
LOGGER.info('refreshing plugin cache')
plugins_data['version'] = version
- plugins_data['plugins'] = json.loads(subprocess.check_output([os.path.join(BASE_DIR, 'bin', 'ansible-doc'), '--json']))
+ for plugin_type in C.DOCUMENTABLE_PLUGINS:
+ plugins_data['plugins'][plugin_type] = json.loads(subprocess.check_output([os.path.join(BASE_DIR, 'bin', 'ansible-doc'),
+ '--json', '-t', plugin_type]))
# remove empty namespaces from plugins
for section in plugins_data['plugins'].values():