mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
adding regions_exclude parameter to be able to do subtractive region exclusion. Defaults to us-gov-west-1 so as to not cause errors for people who don't have govcloud credentials but get it in their regions list
This commit is contained in:
parent
736c8b19d3
commit
ad75350919
2 changed files with 4 additions and 1 deletions
|
@ -12,6 +12,7 @@
|
||||||
# in AWS and merge the results together. Alternatively, set this to a comma
|
# in AWS and merge the results together. Alternatively, set this to a comma
|
||||||
# separated list of regions. E.g. 'us-east-1,us-west-1,us-west-2'
|
# separated list of regions. E.g. 'us-east-1,us-west-1,us-west-2'
|
||||||
regions = all
|
regions = all
|
||||||
|
regions_exclude = us-gov-west-1
|
||||||
|
|
||||||
# When generating inventory, Ansible needs to know how to address a server.
|
# When generating inventory, Ansible needs to know how to address a server.
|
||||||
# Each EC2 instance has a lot of variables associated with it. Here is the list:
|
# Each EC2 instance has a lot of variables associated with it. Here is the list:
|
||||||
|
|
|
@ -189,12 +189,14 @@ class Ec2Inventory(object):
|
||||||
# Regions
|
# Regions
|
||||||
self.regions = []
|
self.regions = []
|
||||||
configRegions = config.get('ec2', 'regions')
|
configRegions = config.get('ec2', 'regions')
|
||||||
|
configRegions_exclude = config.get('ec2', 'regions_exclude')
|
||||||
if (configRegions == 'all'):
|
if (configRegions == 'all'):
|
||||||
if self.eucalyptus_host:
|
if self.eucalyptus_host:
|
||||||
self.regions.append(boto.connect_euca(host=self.eucalyptus_host).region.name)
|
self.regions.append(boto.connect_euca(host=self.eucalyptus_host).region.name)
|
||||||
else:
|
else:
|
||||||
for regionInfo in ec2.regions():
|
for regionInfo in ec2.regions():
|
||||||
self.regions.append(regionInfo.name)
|
if regionInfo.name not in configRegions_exclude:
|
||||||
|
self.regions.append(regionInfo.name)
|
||||||
else:
|
else:
|
||||||
self.regions = configRegions.split(",")
|
self.regions = configRegions.split(",")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue