From 98791eaffffeef06e1e38fd774eeac84851c4e56 Mon Sep 17 00:00:00 2001 From: David Vallee Delisle Date: Tue, 9 Feb 2021 21:28:41 -0500 Subject: [PATCH] [autodoc] guessing converge playbook If a molecule has a defined converge playbook, we should use it instead of defaulting to the role's playbook. Change-Id: Idc55fba78ce91d472ed367f5097505c9a5d9b6dd --- doc/source/_exts/ansible-autodoc.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/doc/source/_exts/ansible-autodoc.py b/doc/source/_exts/ansible-autodoc.py index 5d61b8c16..d47c2b351 100644 --- a/doc/source/_exts/ansible-autodoc.py +++ b/doc/source/_exts/ansible-autodoc.py @@ -238,6 +238,7 @@ class AnsibleAutoPluginDirective(Directive): ) ) + default_playbook = [molecule_path, test, 'converge.yml'] provisioner_data = molecule_conf.get('provisioner') if provisioner_data: inventory = provisioner_data.get('inventory') @@ -248,12 +249,13 @@ class AnsibleAutoPluginDirective(Directive): section_title='Molecule Inventory' ) ) + try: + converge = provisioner_data['playbooks']['converge'] + default_playbook = default_playbook[:-1] + [converge] + except KeyError: + pass - molecule_playbook_path = os.path.join( - molecule_path, - test, - 'converge.yml' - ) + molecule_playbook_path = os.path.join(*default_playbook) with open(molecule_playbook_path) as f: molecule_playbook = yaml.safe_load(f.read()) molecule_section.append(