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

[cloud] EC2 dynamic inventory default filename is documented as ec2.ini - fixes #24396 (#24515)

Browse source 
* the default filename is ec2.ini

(to override that use the env var EC2_INI_PATH)

* allow fallback to ec2.ini
This commit is contained in:
Sloane Hertel 2017-05-31 14:59:55 -04:00 committed by Ryan Brown
parent d03b16e88b
commit e67cdd448e
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/inventory/ec2.py
View file

@ -226,6 +226,7 @@ class Ec2Inventory(object):
defaults = { defaults = {
'ec2': { 'ec2': {
'ini_fallback': os.path.join(os.path.dirname(__file__), 'ec2.ini'),
'ini_path': os.path.join(os.path.dirname(__file__), '%s.ini' % scriptbasename) 'ini_path': os.path.join(os.path.dirname(__file__), '%s.ini' % scriptbasename)
} }
} }
@ -236,6 +237,10 @@ class Ec2Inventory(object):
config = configparser.SafeConfigParser() config = configparser.SafeConfigParser()
ec2_ini_path = os.environ.get('EC2_INI_PATH', defaults['ec2']['ini_path']) ec2_ini_path = os.environ.get('EC2_INI_PATH', defaults['ec2']['ini_path'])
ec2_ini_path = os.path.expanduser(os.path.expandvars(ec2_ini_path)) ec2_ini_path = os.path.expanduser(os.path.expandvars(ec2_ini_path))
if not os.path.isfile(ec2_ini_path):
ec2_ini_path = os.path.expanduser(defaults['ec2']['ini_fallback'])
config.read(ec2_ini_path) config.read(ec2_ini_path)
# is eucalyptus? # is eucalyptus?