Merge lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv |
Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next |
Diff against target: |
371 lines (+180/-10) 9 files modified
hooks/charmhelpers/contrib/openstack/neutron.py (+17/-2) hooks/nova_compute_context.py (+18/-0) hooks/nova_compute_hooks.py (+5/-1) hooks/nova_compute_utils.py (+42/-5) templates/grizzly/nova.conf (+6/-0) templates/havana/cisco_plugins.ini (+45/-0) templates/havana/nova.conf (+5/-0) templates/icehouse/ml2_conf.ini (+2/-1) unit_tests/test_nova_compute_utils.py (+40/-1) |
To merge this branch: | bzr merge lp://qastaging/~springfield-team/charms/trusty/nova-compute/n1kv |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Shiv Prasad Rao (community) | Needs Resubmitting | ||
Edward Hope-Morley | Pending | ||
Jorge Niedbalski | Pending | ||
Billy Olsen | Pending | ||
OpenStack Charmers | Pending | ||
Review via email: mp+235184@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2014-08-14.
This proposal has been superseded by a proposal from 2014-11-20.
Description of the change
On a compute node, Cisco N1KV virtual switch is one of the choices to provide L2 switching service for VMs.
This proposal is for facilitating the integration of N1KV on a compute node
Most of the changes are going in par with nvp and ovs serving an additional choice of L2 swtiches
--
Note:
Charm-helper changes have already been synced with lp:charm-helpers. So can be ignored.
-----
Please look at the old merge proposal:
https:/
Unmerged revisions
- 84. By Shiv Prasad Rao
-
Addressing review comments
- 83. By Shiv Prasad Rao
-
Addressing review comments
- 82. By Edward Hope-Morley
-
tidyup
- 81. By Edward Hope-Morley
-
fixed lint issues
- 80. By Edward Hope-Morley
-
[hopem] synced /next
- 79. By Jorge Niedbalski
-
[all] resync with /next && charm helpers "make sync"
- 78. By Shiv Prasad Rao
-
Sync revision 86
- 77. By Shiv Prasad Rao
-
addressing review comments
- 76. By Shiv Prasad Rao
-
addressing review comments
- 75. By Shiv Prasad Rao
-
fixing flake8 issues
Hello,
Please fix the following 'make lint' errors:
hooks/nova_ compute_ context. py:322: 17: E126 continuation line over-indented for hanging indent compute_ context. py:324: 17: E126 continuation line over-indented for hanging indent compute_ context. py:326: 17: E126 continuation line over-indented for hanging indent compute_ utils.py: 176:80: E501 line too long (86 > 79 characters) compute_ utils.py: 177:80: E501 line too long (107 > 79 characters) compute_ utils.py: 474:80: E501 line too long (96 > 79 characters) test_nova_ compute_ utils.py: 372:80: E501 line too long (90 > 79 characters) test_nova_ compute_ utils.py: 378:80: E501 line too long (111 > 79 characters) test_nova_ compute_ utils.py: 382:80: E501 line too long (93 > 79 characters)
hooks/nova_
hooks/nova_
hooks/nova_
hooks/nova_
hooks/nova_
unit_tests/
unit_tests/
unit_tests/
Also , Please remove the commented modules from tests, if you aren't using them.
After having this fixed, LGTM.