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

Fix Include_vars example (#69966)

Browse source 
* Remove incorrect var in first_found docs
* Fix include_vars example using lookup
This commit is contained in:
Falcon Taylor-Carter 2020-06-11 16:24:52 -04:00 • committed by GitHub
parent 8c3eb7ae4a
commit f5df702b55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/ansible/modules/include_vars.py
View file

@ -95,12 +95,15 @@ EXAMPLES = r'''
when: x == 0 when: x == 0
- name: Load a variable file based on the OS type, or a default if not found. Using free-form to specify the file. - name: Load a variable file based on the OS type, or a default if not found. Using free-form to specify the file.
include_vars: "{{ lookup('first_found', possible_files) }}" include_vars: "{{ lookup('first_found', params) }}"
vars: vars:
possible_files: params:
- "{{ ansible_distribution }}.yaml" files:
- "{{ ansible_os_family }}.yaml" - '{{ansible_distribution}}.yaml'
- default.yaml - '{{ansible_os_family}}.yaml'
- default.yaml
paths:
- 'vars'
- name: Bare include (free-form) - name: Bare include (free-form)
include_vars: myvars.yaml include_vars: myvars.yaml

2
lib/ansible/plugins/lookup/first_found.py
View file

@ -88,7 +88,7 @@ EXAMPLES = """
vars: vars:
params: params:
files: files:
- '{{ansible_os_distribution}}.yml' - '{{ansible_distribution}}.yml'
- '{{ansible_os_family}}.yml' - '{{ansible_os_family}}.yml'
- default.yml - default.yml
paths: paths: