Skip to content

A
ansible
Commit 7f45c9ed by Andrew Hamilton Committed by Abhijit Menon-Sen
Options

Have ec2.py expand tilde and vars when looking up the EC2_INI_PATH env variable

parent 73aa5686
Showing with 1 additions and 1 deletions
contrib/inventory/ec2.py
...@@ -192,7 +192,7 @@ class Ec2Inventory(object): ...@@ -192,7 +192,7 @@ class Ec2Inventory(object):
else: else:
config = configparser.ConfigParser() config = configparser.ConfigParser()
ec2_default_ini_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'ec2.ini') 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) config.read(ec2_ini_path)
# is eucalyptus? # is eucalyptus?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment