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

Remove trailing white space

Browse source
This commit is contained in:
Shaun Brady 2016-07-28 13:43:40 -04:00 committed by Matt Clay
parent 04199140c5
commit 3b32b60338
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/modules/cloud/amazon/ec2_elb_lb.py
View file

@ -454,7 +454,7 @@ class ElbManager(object):
self.wait = wait self.wait = wait
self.wait_timeout = wait_timeout self.wait_timeout = wait_timeout
self.tags = tags self.tags = tags
self.aws_connect_params = aws_connect_params self.aws_connect_params = aws_connect_params
self.region = region self.region = region
@ -496,7 +496,7 @@ class ElbManager(object):
self._set_instance_ids() self._set_instance_ids()
self._set_tags() self._set_tags()
def ensure_gone(self): def ensure_gone(self):
"""Destroy the ELB""" """Destroy the ELB"""
if self.elb: if self.elb:
@ -608,7 +608,7 @@ class ElbManager(object):
info['cross_az_load_balancing'] = 'no' info['cross_az_load_balancing'] = 'no'
# return stickiness info? # return stickiness info?
info['tags'] = self.tags info['tags'] = self.tags
return info return info
@ -1170,7 +1170,7 @@ class ElbManager(object):
"""Add/Delete tags""" """Add/Delete tags"""
if self.tags is None: if self.tags is None:
return return
params = {'LoadBalancerNames.member.1': self.name} params = {'LoadBalancerNames.member.1': self.name}
tagdict = dict() tagdict = dict()
@ -1181,8 +1181,8 @@ class ElbManager(object):
[('member', Tag)]) [('member', Tag)])
tagdict = dict((tag.Key, tag.Value) for tag in current_tags tagdict = dict((tag.Key, tag.Value) for tag in current_tags
if hasattr(tag, 'Key')) if hasattr(tag, 'Key'))
# Add missing tags # Add missing tags
dictact = dict(set(self.tags.items()) - set(tagdict.items())) dictact = dict(set(self.tags.items()) - set(tagdict.items()))
if dictact: if dictact:
for i, key in enumerate(dictact): for i, key in enumerate(dictact):
@ -1192,7 +1192,7 @@ class ElbManager(object):
self.elb_conn.make_request('AddTags', params) self.elb_conn.make_request('AddTags', params)
self.changed=True self.changed=True
# Remove extra tags # Remove extra tags
dictact = dict(set(tagdict.items()) - set(self.tags.items())) dictact = dict(set(tagdict.items()) - set(self.tags.items()))
if dictact: if dictact:
for i, key in enumerate(dictact): for i, key in enumerate(dictact):
@ -1200,7 +1200,7 @@ class ElbManager(object):
self.elb_conn.make_request('RemoveTags', params) self.elb_conn.make_request('RemoveTags', params)
self.changed=True self.changed=True
def _get_health_check_target(self): def _get_health_check_target(self):
"""Compose target string from healthcheck parameters""" """Compose target string from healthcheck parameters"""
protocol = self.health_check['ping_protocol'].upper() protocol = self.health_check['ping_protocol'].upper()
@ -1274,7 +1274,7 @@ def main():
wait = module.params['wait'] wait = module.params['wait']
wait_timeout = module.params['wait_timeout'] wait_timeout = module.params['wait_timeout']
tags = module.params['tags'] tags = module.params['tags']
if state == 'present' and not listeners: if state == 'present' and not listeners:
module.fail_json(msg="At least one port is required for ELB creation") module.fail_json(msg="At least one port is required for ELB creation")