1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Fix n3k separate to combined image upgrade (#37017)

* Fix n3k separate to combined image upgrade

* Address review comments
This commit is contained in:
Mike Wiebe 2018-03-05 23:35:08 -05:00 committed by Trishna Guha
parent ba3201cd2f
commit 51e8eab9db

View file

@ -383,6 +383,7 @@ def build_install_cmd_set(issu, image, kick, type):
else: else:
commands.append( commands.append(
'%s system %s kickstart %s' % (rootcmd, image, kick)) '%s system %s kickstart %s' % (rootcmd, image, kick))
return commands return commands
@ -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 # The system may be busy from the previous call to check_mode so loop
# until it's done. # until it's done.
data = check_install_in_progress(module, commands, opts) 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 data['error'] = True
return data return data