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

Little improvement in the organization of the configuration loader method

Browse source
This commit is contained in:
Victor Schröder 2015-06-14 22:13:27 +02:00
parent bc80bd36af
commit 50b320615e
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/inventory/ec2.py
View file

@ -238,11 +238,13 @@ class Ec2Inventory(object):
if config.has_option('ec2', 'elasticache'): if config.has_option('ec2', 'elasticache'):
self.elasticache_enabled = config.getboolean('ec2', 'elasticache') self.elasticache_enabled = config.getboolean('ec2', 'elasticache')
# Return all EC2 and RDS instances (if RDS is enabled) # Return all EC2 instances?
if config.has_option('ec2', 'all_instances'): if config.has_option('ec2', 'all_instances'):
self.all_instances = config.getboolean('ec2', 'all_instances') self.all_instances = config.getboolean('ec2', 'all_instances')
else: else:
self.all_instances = False self.all_instances = False
# Return all RDS instances? (if RDS is enabled)
if config.has_option('ec2', 'all_rds_instances') and self.rds_enabled: if config.has_option('ec2', 'all_rds_instances') and self.rds_enabled:
self.all_rds_instances = config.getboolean('ec2', 'all_rds_instances') self.all_rds_instances = config.getboolean('ec2', 'all_rds_instances')
else: else: