mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge branch 'ec2inv-rdstoggle' of https://github.com/ingmar/ansible into ingmar-ec2inv-rdstoggle
Conflicts: plugins/inventory/ec2.py
This commit is contained in:
commit
0ae87cb725
2 changed files with 12 additions and 3 deletions
|
@ -38,6 +38,9 @@ vpc_destination_variable = ip_address
|
||||||
# Route53, uncomment and set 'route53' to True.
|
# Route53, uncomment and set 'route53' to True.
|
||||||
route53 = False
|
route53 = 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
|
# 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.
|
||||||
# route53_excluded_zones = samplezone1.com, samplezone2.com
|
# route53_excluded_zones = samplezone1.com, samplezone2.com
|
||||||
|
|
|
@ -222,12 +222,17 @@ class Ec2Inventory(object):
|
||||||
self.route53_excluded_zones.extend(
|
self.route53_excluded_zones.extend(
|
||||||
config.get('ec2', 'route53_excluded_zones', '').split(','))
|
config.get('ec2', 'route53_excluded_zones', '').split(','))
|
||||||
|
|
||||||
# Return all EC2/RDS instances
|
# Include RDS instances?
|
||||||
|
self.rds_enabled = True
|
||||||
|
if config.has_option('ec2', 'rds'):
|
||||||
|
self.rds_enabled = config.getboolean('ec2', 'rds')
|
||||||
|
|
||||||
|
# Return all EC2 and RDS instances (if RDS is enabled)
|
||||||
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
|
||||||
if config.has_option('ec2', 'all_rds_instances'):
|
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:
|
||||||
self.all_rds_instances = False
|
self.all_rds_instances = False
|
||||||
|
@ -268,7 +273,8 @@ class Ec2Inventory(object):
|
||||||
|
|
||||||
for region in self.regions:
|
for region in self.regions:
|
||||||
self.get_instances_by_region(region)
|
self.get_instances_by_region(region)
|
||||||
self.get_rds_instances_by_region(region)
|
if self.rds_enabled:
|
||||||
|
self.get_rds_instances_by_region(region)
|
||||||
|
|
||||||
self.write_to_cache(self.inventory, self.cache_path_cache)
|
self.write_to_cache(self.inventory, self.cache_path_cache)
|
||||||
self.write_to_cache(self.index, self.cache_path_index)
|
self.write_to_cache(self.index, self.cache_path_index)
|
||||||
|
|
Loading…
Reference in a new issue