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

pull/6722/head
Ingmar Hupp 11 years ago
parent 456d2627e8
commit cc01f7b7f5

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

@ -223,7 +223,9 @@ class Ec2Inventory(object):
config.get('ec2', 'route53_excluded_zones', '').split(',')) config.get('ec2', 'route53_excluded_zones', '').split(','))
# RDS # 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 related
cache_dir = os.path.expanduser(config.get('ec2', 'cache_path')) cache_dir = os.path.expanduser(config.get('ec2', 'cache_path'))

Loading…
Cancel
Save