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

Merge pull request #3981 from jerm/devel

Browse source 
Adding regions_exclude parameter to be able to do subtractive region exc...
This commit is contained in:
Michael DeHaan 2013-08-31 17:00:38 -07:00
commit 6f76ccf10e
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plugins/inventory/ec2.ini
View file

@ -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:

4
plugins/inventory/ec2.py
View file

@ -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(",")