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

Merge pull request #1032 from mavimo/patch-2

Browse source 
Add support for ./ansible.cfg file
This commit is contained in:
Michael DeHaan 2012-09-11 14:56:22 -07:00
commit d7f83471ae
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/constants.py
View file

@ -35,13 +35,16 @@ def get_config(p, section, key, env_var, default):
def load_config_file(): def load_config_file():
p = ConfigParser.ConfigParser() p = ConfigParser.ConfigParser()
path1 = os.path.expanduser( path1 = os.getcwd() + "/ansible.cfg"
os.environ.get('ANSIBLE_CONFIG', "~/.ansible.cfg")) path2 = os.path.expanduser(os.environ.get('ANSIBLE_CONFIG', "~/.ansible.cfg"))
path2 = "/etc/ansible/ansible.cfg" path3 = "/etc/ansible/ansible.cfg"
if os.path.exists(path1): if os.path.exists(path1):
p.read(path1) p.read(path1)
elif os.path.exists(path2): elif os.path.exists(path2):
p.read(path2) p.read(path2)
elif os.path.exists(path3):
p.read(path3)
else: else:
return None return None
return p return p