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

Merge pull request #4376 from cchurch/devel

Browse source 
Support for alternate ec2.ini path via EC2_INI_PATH environment variable
This commit is contained in:
Michael DeHaan 2013-10-04 14:46:45 -07:00
commit 6bd90b7e80
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/inventory/ec2.py
View file

@ -12,6 +12,11 @@ variables needed for Boto have already been set:
export AWS_ACCESS_KEY_ID='AK123' export AWS_ACCESS_KEY_ID='AK123'
export AWS_SECRET_ACCESS_KEY='abc123' export AWS_SECRET_ACCESS_KEY='abc123'
This script also assumes there is an ec2.ini file alongside it. To specify a
different path to ec2.ini, define the EC2_INI_PATH environment variable:
export EC2_INI_PATH=/path/to/my_ec2.ini
If you're using eucalyptus you need to set the above variables and If you're using eucalyptus you need to set the above variables and
you need to define: you need to define:
@ -177,7 +182,9 @@ class Ec2Inventory(object):
''' Reads the settings from the ec2.ini file ''' ''' Reads the settings from the ec2.ini file '''
config = ConfigParser.SafeConfigParser() config = ConfigParser.SafeConfigParser()
config.read(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)
config.read(ec2_ini_path)
# is eucalyptus? # is eucalyptus?
self.eucalyptus_host = None self.eucalyptus_host = None