xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-22 07:34:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:jjohnson42/confluent

Browse Source
This commit is contained in:
Jarrod Johnson 2017-07-27 09:03:53 -04:00
commit 4a929eb9b5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
confluent_client/bin/nodefirmware
View File

@ -116,7 +116,9 @@ def update_firmware(session, filename):
output.set_output(node, progress)
time.sleep(2)
allerrnodes = ','.join(noderrs)
sys.stderr.write('Nodes had errors updating ({0})!\n'.format(allerrnodes))
if noderrs:
sys.stderr.write(
'Nodes had errors updating ({0})!\n'.format(allerrnodes))
for node in noderrs:
sys.stderr.write('{0}: {1}\n'.format(node, noderrs[node]))

6
confluent_server/confluent/core.py
View File

@ -234,12 +234,10 @@ def _init_core():
'default': 'ipmi',
}),
'updates': {
'active': {
PluginCollection({
'active': PluginCollection({
'pluginattrs': ['hardwaremanagement.method'],
'default': 'ipmi',
}),
},
}),
},
},
},