opendev/puppet-jenkins
Code Issues Proposed changes

Don't try to delete master during safe restart

Browse Source 
The master computer can be offline like any other slave but it cannot be
deleted so do not try to delete it.

Change-Id: I5b44f89cf2a8838bf2ea32bd5d7baaffe31f8451
This commit is contained in:
Clark Boylan 2016-04-09 11:20:28 -07:00
parent ea7e530fe0
commit 86589a9860
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/safe_jenkins_shutdown
View File

@ -24,7 +24,8 @@ def delete_offline_nodes(server, timeout):
end = start + timeout end = start + timeout
while True: while True:
nodes = server.get_nodes() nodes = server.get_nodes()
offline_nodes = [node for node in nodes if node['offline']] offline_nodes = [node for node in nodes if node['offline'] and
node['name'] != 'master']
if not offline_nodes: if not offline_nodes:
# We have converged to no offline nodes state # We have converged to no offline nodes state
break break