saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

INFRA-1593 - clear up pylint complaints

Browse source
This commit is contained in:
Tom Williams 2016-06-24 13:50:27 -04:00
parent 3afa453cc0
commit c789580d48
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/boto_elb.py
View file

@ -801,10 +801,10 @@ def set_instances(name, instances, test=False, region=None, key=None, keyid=None
if test:
return bool(add or remove)
if len(remove):
if deregister_instances(name, list(remove), region, key, keyid, profile) == False:
if deregister_instances(name, list(remove), region, key, keyid, profile) is False:
ret = False
if len(add):
if register_instances(name, list(add), region, key, keyid, profile) == False:
if register_instances(name, list(add), region, key, keyid, profile) is False:
ret = False
return ret

1
salt/states/boto_asg.py
View file

@ -438,6 +438,7 @@ def present(
}
if 'image_name' in launch_config:
image_name = launch_config['image_name']
args = {'ami_name': image_name, 'region': region, 'key': key,
'keyid': keyid, 'profile': profile}
image_ids = __salt__['boto_ec2.find_images'](**args)

2
salt/states/boto_elb.py
View file

@ -247,9 +247,9 @@ from salt.utils import exactly_one
from salt.exceptions import SaltInvocationError
import salt.ext.six as six
log = logging.getLogger(__name__)
def __virtual__():
'''
Only load if boto is available.