internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 05:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11738 from amenonsen/7485-rebase

Browse Source 
Have ec2.py expand tilde and vars when looking up the EC2_INI_PATH env variable
This commit is contained in:
James Cammarata
2015-07-26 11:11:02 -04:00
parent 73aa5686cc 7f45c9edf7
commit d11e07a0e5
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/inventory/ec2.py
View File

@@ -192,7 +192,7 @@ class Ec2Inventory(object):
else:
config = configparser.ConfigParser()
ec2_default_ini_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'ec2.ini')
ec2_ini_path = os.environ.get('EC2_INI_PATH', ec2_default_ini_path)
ec2_ini_path = os.path.expanduser(os.path.expandvars(os.environ.get('EC2_INI_PATH', ec2_default_ini_path)))
config.read(ec2_ini_path)
# is eucalyptus?