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 #42473 from rallytime/bp-42436

Browse source 
Back-port #42436 to 2017.7.1
This commit is contained in:
garethgreenaway 2017-07-24 08:10:27 -07:00 • committed by GitHub
commit 5b99d45f54
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
salt/runners/manage.py
View file

@ -652,6 +652,7 @@ def versions():
return ret
labels = {
-2: 'Minion offline',
-1: 'Minion requires update',
0: 'Up to date',
1: 'Minion newer than master',
@ -663,12 +664,19 @@ def versions():
master_version = salt.version.__saltstack_version__
for minion in minions:
minion_version = salt.version.SaltStackVersion.parse(minions[minion])
ver_diff = cmp(minion_version, master_version)
if not minions[minion]:
minion_version = False
ver_diff = -2
else:
minion_version = salt.version.SaltStackVersion.parse(minions[minion])
ver_diff = cmp(minion_version, master_version)
if ver_diff not in version_status:
version_status[ver_diff] = {}
version_status[ver_diff][minion] = minion_version.string
if minion_version:
version_status[ver_diff][minion] = minion_version.string
else:
version_status[ver_diff][minion] = minion_version
# Add version of Master to output
version_status[2] = master_version.string