valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move debug to pchanges and copy all to comment

Browse Source
This commit is contained in:
Brandon Ewing 2017-03-23 12:55:57 -05:00
parent 710a617db0
commit b0aebcdab6
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
salt/utils/napalm.py
View File

@ -362,36 +362,39 @@ def loaded_ret(ret, loaded, test, debug):
ret.update({
'comment': loaded.get('comment', '')
})
pchanges = {}
if not loaded.get('result', False):
# Failure of some sort
return ret
if debug:
# Always check for debug
pchanges.update({
'loaded_config': loaded.get('loaded_config', '')
})
ret.update({
"comment": "Debug loaded_config:\n{}\n{}".format(loaded.get('loaded_config', ''),
ret.get('comment', ''))
"pchanges": pchanges
})
if not loaded.get('already_configured', True):
# We're making changes
pchanges.update({
"diff": loaded.get('diff', '')
})
ret.update({
'pchanges': {
'diff': loaded.get('diff', '')
}
'pchanges': pchanges
})
if test:
comment = "To be changed:\n{}\n{}".format(ret.get('pchanges', '').get('diff', ''),
ret.get('comment', ''))
for k, v in pchanges.items():
ret.update({
"comment": "{}:\n{}\n\n{}".format(k, v, ret.get("comment", ''))
})
ret.update({
'result': None,
'comment': comment
})
return ret
# Not test, changes were applied
ret.update({
'result': True,
'changes': {
'diff': loaded.get('diff', '')
},
'changes': pchanges,
'comment': "Configuration changed!\n{}".format(ret.get('comment', ''))
})
return ret