Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix n3k separate to combined image upgrade #37017

Merged
merged 2 commits into from Mar 6, 2018
Merged

Fix n3k separate to combined image upgrade #37017

merged 2 commits into from Mar 6, 2018

Conversation

mikewiebe
Copy link
Contributor

SUMMARY

This fixes a problem when attempting to upgrade from a 6.x kickstart/system image to a combined 7.x image.

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

nxos_install_os

ANSIBLE VERSION
ansible 2.6.0 (rel250/fix_nxos_install_os d6a56457cc) last updated 2018/03/05 10:32:55 (GMT -400)
  config file = /etc/ansible/ansible.cfg
  configured module search path = [u'/root/.ansible/plugins/modules', u'/usr/share/ansible/plugins/modules']
  ansible python module location = /root/agents-ci/ansible/lib/ansible
  executable location = /root/agents-ci/ansible/bin/ansible
  python version = 2.7.12 (default, Dec  4 2017, 14:50:18) [GCC 5.4.0 20160609]
ADDITIONAL INFORMATION

NOTE This fix is needed in 2.5

@mikewiebe
Copy link
Contributor Author

@trishnaguha Hopefully it's not too late, but we need this fix in the 2.5 release.

@ansibot
Copy link
Contributor

ansibot commented Mar 5, 2018

cc @GGabriele @jedelman8 @kedarX @privateip @rahushen @rcarrillocruz
click here for bot help

@ansibot ansibot added bug This issue/PR relates to a bug. core_review In order to be merged, this PR must follow the core review workflow. module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. networking Network category nxos Cisco NXOS community owner_pr This PR is made by the module's maintainer. support:network This issue/PR relates to code supported by the Ansible Network Team. labels Mar 5, 2018
trishnaguha
trishnaguha reviewed Mar 5, 2018
View reviewed changes
lib/ansible/modules/network/nxos/nxos_install_os.py Outdated
@@ -245,6 +245,8 @@ def parse_show_install(data):
ud['server_error'] = True
elif data == -32603:
ud['server_error'] = True
elif data == 'No install all data found':
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mikewiebe there is a check on L241 if isinstance(data, int).
From elif data == 'No install all data found:' it looks like data is string. Will the code hit this condition?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Your right that it will never hit this condition. Let me move the check.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out this check is not needed. I removed it.

@trishnaguha trishnaguha removed the needs_triage Needs a first human triage before being processed. label Mar 5, 2018
@trishnaguha trishnaguha added this to the 2.5.0 milestone Mar 5, 2018
@trishnaguha trishnaguha merged commit 51e8eab into ansible:devel Mar 6, 2018
trishnaguha pushed a commit to trishnaguha/ansible that referenced this pull request Mar 6, 2018
@mikewiebe @trishnaguha
Fix n3k separate to combined image upgrade (ansible#37017)
5e86ddd 
* Fix n3k separate to combined image upgrade

* Address review comments

(cherry picked from commit 51e8eab)
trishnaguha added a commit that referenced this pull request Mar 6, 2018
@trishnaguha
Fix n3k separate to combined image upgrade (#37017) (#37055)
f48d636 
* Fix n3k separate to combined image upgrade

* Address review comments

(cherry picked from commit 51e8eab)
@trishnaguha
Copy link
Member

cherry-picked to stable-2.5.

@mikewiebe mikewiebe deleted the rel250/fix_nxos_install_os branch November 26, 2018 18:06
@dagwieers dagwieers added the cisco Cisco technologies label Feb 23, 2019
@ansible ansible locked and limited conversation to collaborators Apr 27, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@trishnaguha trishnaguha trishnaguha approved these changes

Assignees

@trishnaguha trishnaguha

Labels
bug This issue/PR relates to a bug. cisco Cisco technologies core_review In order to be merged, this PR must follow the core review workflow. module This issue/PR relates to a module. networking Network category nxos Cisco NXOS community owner_pr This PR is made by the module's maintainer. support:network This issue/PR relates to code supported by the Ansible Network Team.
Projects
No open projects
zzz NOT USED: Networking Bugs
  
Done
Milestone
2.5.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mikewiebe @ansibot @trishnaguha @dagwieers