summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Wiebe <mwiebe@cisco.com>2018-03-05 23:35:08 -0500
committerTrishna Guha <trishnaguha17@gmail.com>2018-03-06 10:05:08 +0530
commit51e8eab9db343177700640eb42709ba8facee035 (patch)
tree84ccf7194cf484892be699407abf7009a2ceadf4
parentba3201cd2fd949f1f6566cfbd4a617de660ec500 (diff)
downloadansible-51e8eab9db343177700640eb42709ba8facee035.tar.gz
Fix n3k separate to combined image upgrade (#37017)
* Fix n3k separate to combined image upgrade * Address review comments
-rw-r--r--lib/ansible/modules/network/nxos/nxos_install_os.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ansible/modules/network/nxos/nxos_install_os.py b/lib/ansible/modules/network/nxos/nxos_install_os.py
index 3b87b5403d..820b9f2f20 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