External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-27 13:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6038 from gamuniz/honor_thy_precedence

Browse Source 
fixed precedence on ansible.cfg

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-03-04 18:58:12 +00:00
committed by GitHub
parent 8b95d7be94 350046d495
commit d08f59272e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/utils/ansible.py
View File

@@ -106,7 +106,7 @@ def could_be_inventory(project_path, dir_path, filename):
def read_ansible_config(project_path, variables_of_interest): def read_ansible_config(project_path, variables_of_interest):
fnames = ['/etc/ansible/ansible.cfg'] fnames = ['/etc/ansible/ansible.cfg']
if project_path: if project_path:
fnames.insert(0, os.path.join(project_path, 'ansible.cfg')) fnames.append(os.path.join(project_path, 'ansible.cfg'))
values = {} values = {}
try: try:
parser = ConfigParser() parser = ConfigParser()