From f48d636500867797e10fff240dd9a5e9e1a649c7 Mon Sep 17 00:00:00 2001 From: Trishna Guha Date: Tue, 6 Mar 2018 10:40:02 +0530 Subject: [PATCH] Fix n3k separate to combined image upgrade (#37017) (#37055) * Fix n3k separate to combined image upgrade * Address review comments (cherry picked from commit 51e8eab9db343177700640eb42709ba8facee035) --- lib/ansible/modules/network/nxos/nxos_install_os.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/network/nxos/nxos_install_os.py b/lib/ansible/modules/network/nxos/nxos_install_os.py index 3b87b5403d9..820b9f2f20a 100644 --- a/lib/ansible/modules/network/nxos/nxos_install_os.py +++ b/lib/ansible/modules/network/nxos/nxos_install_os.py @@ -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 @@ -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