Skip to content

Commit

Permalink
[cloud][aws] PEP8 renaming in EC2 dynamic inventory (ansible#39164)
Browse files Browse the repository at this point in the history
  • Loading branch information
javierbeaumont authored and Alexander Bethke committed May 15, 2018
1 parent f9b156b commit 802cba7
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions contrib/inventory/ec2.py
Original file line number Diff line number Diff line change
Expand Up @@ -340,18 +340,18 @@ def read_settings(self):

# Regions
self.regions = []
configRegions = config.get('ec2', 'regions')
if (configRegions == 'all'):
config_regions = config.get('ec2', 'regions')
if (config_regions == 'all'):
if self.eucalyptus_host:
self.regions.append(boto.connect_euca(host=self.eucalyptus_host).region.name, **self.credentials)
else:
configRegions_exclude = config.get('ec2', 'regions_exclude')
config_regions_exclude = config.get('ec2', 'regions_exclude')

for regionInfo in ec2.regions():
if regionInfo.name not in configRegions_exclude:
self.regions.append(regionInfo.name)
for region_info in ec2.regions():
if region_info.name not in config_regions_exclude:
self.regions.append(region_info.name)
else:
self.regions = configRegions.split(",")
self.regions = config_regions.split(",")
if 'auto' in self.regions:
env_region = os.environ.get('AWS_REGION')
if env_region is None:
Expand Down

0 comments on commit 802cba7

Please sign in to comment.