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

Merge pull request #43435 from blueyed/boto_elb-register-currently-deregistrating

Browse source 
boto_elb.register_instances: do not skip instances being unregistered
This commit is contained in:
Mike Place 2017-09-22 13:36:24 -06:00 • committed by GitHub
commit fc3489489e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/states/boto_elb.py
View file

@ -517,7 +517,8 @@ def register_instances(name, instances, region=None, key=None, keyid=None,
health = __salt__['boto_elb.get_instance_health'](
name, region, key, keyid, profile)
nodes = [value['instance_id'] for value in health]
nodes = [value['instance_id'] for value in health
if value['description'] != 'Instance deregistration currently in progress.']
new = [value for value in instances if value not in nodes]
if not len(new):
msg = 'Instance/s {0} already exist.'.format(str(instances).strip('[]'))