cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

corrected import_play into to import_playbook (#30853)

Browse source 
* corrected import_play into to import_playbook

fixes #30744
This commit is contained in:
Brian Coca 2017-09-26 17:27:21 -04:00 committed by GitHub
parent 8378ac30b3
commit 17f094bb6a
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/docsite/rst/playbooks_best_practices.rst
View file

@ -221,8 +221,8 @@ some other playbooks::
--- ---
# file: site.yml # file: site.yml
- import_plays: webservers.yml - import_playbook: webservers.yml
- import_plays: dbservers.yml - import_playbook: dbservers.yml
In a file like webservers.yml (also at the top level), we map the configuration of the webservers group to the roles performed by the webservers group:: In a file like webservers.yml (also at the top level), we map the configuration of the webservers group to the roles performed by the webservers group::

2
docs/docsite/rst/roadmap/ROADMAP_2_4.rst
View file

@ -128,7 +128,7 @@ Runtime Check on Modules for Blacklisting
Disambiguate Includes Disambiguate Includes
--------------------- ---------------------
- Create import_x for 'static includes' (import_task, import_play, import_role) - Create import_x for 'static includes' (import_task, import_playbook, import_role)
- Any directives are applied to the 'imported' tasks - Any directives are applied to the 'imported' tasks

2
lib/ansible/modules/utilities/logic/_include.py
View file

@ -20,7 +20,7 @@ module: include
short_description: include a play or task list. short_description: include a play or task list.
deprecated: deprecated:
The include action was too confusing, dealing with both plays and tasks, being both dynamic and static. This module will be removed in version 2.8. The include action was too confusing, dealing with both plays and tasks, being both dynamic and static. This module will be removed in version 2.8.
As alternatives use include_tasks, import_plays, import_tasks. As alternatives use include_tasks, import_playbook, import_tasks.
description: description:
- Includes a file with a list of plays or tasks to be executed in the current playbook. - Includes a file with a list of plays or tasks to be executed in the current playbook.
- Files with a list of plays can only be included at the top level, lists of tasks can only be included where tasks normally run (in play). - Files with a list of plays can only be included at the top level, lists of tasks can only be included where tasks normally run (in play).

6
lib/ansible/modules/utilities/logic/import_plays.py → lib/ansible/modules/utilities/logic/import_playbook.py
View file

@ -16,7 +16,7 @@ DOCUMENTATION = '''
--- ---
author: author:
- "Ansible Core Team (@ansible)" - "Ansible Core Team (@ansible)"
module: import_plays module: import_playbook
short_description: import a playbook. short_description: import a playbook.
description: description:
- Includes a file with a list of plays to be executed. - Includes a file with a list of plays to be executed.
@ -37,7 +37,7 @@ EXAMPLES = """
- debug: - debug:
msg: "play1" msg: "play1"
- import_plays: otherplays.yml - import_playbook: otherplays.yml
- name: This DOES NOT WORK - name: This DOES NOT WORK
@ -47,7 +47,7 @@ EXAMPLES = """
msg: task1 msg: task1
- name: This failes because I'm inside a play already - name: This failes because I'm inside a play already
import_plays: stuff.yml import_playbook: stuff.yml
""" """
RETURN = """ RETURN = """