Skip to content

Commit

Permalink
Fix n3k separate to combined image upgrade (ansible#37017)
Browse files Browse the repository at this point in the history
* Fix n3k separate to combined image upgrade

* Address review comments
  • Loading branch information
mikewiebe authored and trishnaguha committed Mar 6, 2018
1 parent ba3201c commit 51e8eab
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/ansible/modules/network/nxos/nxos_install_os.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ def build_install_cmd_set(issu, image, kick, type):
else:
commands.append(
'%s system %s kickstart %s' % (rootcmd, image, kick))

return commands


Expand Down Expand Up @@ -452,7 +453,7 @@ def check_mode_nextgen(module, issu, image, kick=None):
# The system may be busy from the previous call to check_mode so loop
# until it's done.
data = check_install_in_progress(module, commands, opts)
if re.search(r'No install all data found', data['raw']):
if data['server_error']:
data['error'] = True
return data

Expand Down

0 comments on commit 51e8eab

Please sign in to comment.