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

dont exit on a missing server

Browse source 
This errors if a server gets deleted between when the server_list and
show_server commands are run.  When running map files to build servers, this
could cause the entire map to be evaluated as needing to be run.

If a server disappears, just continue and don't include it.
This commit is contained in:
Daniel Wallace 2016-02-10 23:54:31 -06:00
parent 8ad1ee6db4
commit b2e8202f5d
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/cloud/clouds/nova.py
View file

@ -949,7 +949,11 @@ def list_nodes(call=None, **kwargs):
if not server_list:
return {}
for server in server_list:
server_tmp = conn.server_show(server_list[server]['id'])[server]
server_tmp = conn.server_show(server_list[server]['id']).get(server)
# If the server is deleted while looking it up, skip
if server_tmp is None:
continue
private = []
public = []