|
|
@ -340,18 +340,18 @@ class Ec2Inventory(object):
|
|
|
|
|
|
|
|
|
|
|
|
# Regions
|
|
|
|
# Regions
|
|
|
|
self.regions = []
|
|
|
|
self.regions = []
|
|
|
|
configRegions = config.get('ec2', 'regions')
|
|
|
|
config_regions = config.get('ec2', 'regions')
|
|
|
|
if (configRegions == 'all'):
|
|
|
|
if (config_regions == 'all'):
|
|
|
|
if self.eucalyptus_host:
|
|
|
|
if self.eucalyptus_host:
|
|
|
|
self.regions.append(boto.connect_euca(host=self.eucalyptus_host).region.name, **self.credentials)
|
|
|
|
self.regions.append(boto.connect_euca(host=self.eucalyptus_host).region.name, **self.credentials)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
configRegions_exclude = config.get('ec2', 'regions_exclude')
|
|
|
|
config_regions_exclude = config.get('ec2', 'regions_exclude')
|
|
|
|
|
|
|
|
|
|
|
|
for regionInfo in ec2.regions():
|
|
|
|
for region_info in ec2.regions():
|
|
|
|
if regionInfo.name not in configRegions_exclude:
|
|
|
|
if region_info.name not in config_regions_exclude:
|
|
|
|
self.regions.append(regionInfo.name)
|
|
|
|
self.regions.append(region_info.name)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
self.regions = configRegions.split(",")
|
|
|
|
self.regions = config_regions.split(",")
|
|
|
|
if 'auto' in self.regions:
|
|
|
|
if 'auto' in self.regions:
|
|
|
|
env_region = os.environ.get('AWS_REGION')
|
|
|
|
env_region = os.environ.get('AWS_REGION')
|
|
|
|
if env_region is None:
|
|
|
|
if env_region is None:
|
|
|
|