xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-22 17:43:14 +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-28 15:53:25 -04:00
commit 8123a77451
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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',
}),
},
}),
},
},
},

2
confluent_server/confluent/firmwaremanager.py
View File

@ -30,7 +30,7 @@ def execupdate(handler, filename, updateobj):
updateobj.handle_progress({'phase': 'complete', 'progress': 100.0})
except Exception as e:
updateobj.handle_progress({'phase': 'error', 'progress': 0.0,
'detail': repr(e)})
'detail': str(e)})
class Updater(object):
def __init__(self, node, handler, filename, tenant=None, name=None):