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

Do not filter out RDS instances by default or in INI file to avoid changing current behaviour.

Browse source
This commit is contained in:
Ingmar Hupp 2014-03-27 18:58:46 +00:00
parent 456d2627e8
commit cc01f7b7f5
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/inventory/ec2.ini
View file

@ -38,8 +38,8 @@ vpc_destination_variable = ip_address
# Route53, uncomment and set 'route53' to True.
route53 = False
# To include RDS instances in inventory, set to True.
rds = False
# To exclude RDS instances from the inventory, uncomment and set to False.
#rds = False
# Additionally, you can specify the list of zones to exclude looking up in
# 'route53_excluded_zones' as a comma-separated list.

4
plugins/inventory/ec2.py
View file

@ -223,7 +223,9 @@ class Ec2Inventory(object):
config.get('ec2', 'route53_excluded_zones', '').split(','))
# RDS
self.rds_enabled = config.getboolean('ec2', 'rds')
self.rds_enabled = True
if config.has_option('ec2', 'rds'):
self.rds_enabled = config.getboolean('ec2', 'rds')
# Cache related
cache_dir = os.path.expanduser(config.get('ec2', 'cache_path'))