Merge lp://qastaging/~james-page/charms/trusty/nova-compute/disable-neutron-security-option into lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by James Page
Status: Merged
Approved by: Liam Young
Approved revision: 69
Merged at revision: 69
Proposed branch: lp://qastaging/~james-page/charms/trusty/nova-compute/disable-neutron-security-option
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 68 lines (+33/-1)
4 files modified
config.yaml (+8/-0)
hooks/nova_compute_context.py (+8/-0)
templates/icehouse/ml2_conf.ini (+1/-1)
unit_tests/test_nova_compute_contexts.py (+16/-0)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/nova-compute/disable-neutron-security-option
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+221752@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-06-02.

Description of the change

Add option to allow the nova-compute charm to override neutron security group configuration provided from the nova-cloud-controller.

To post a comment you must log in.
65. By James Page

Do the disable a different way

66. By James Page

Put disable in the right place

67. By James Page

Add big warning

68. By James Page

Tidy lint, add unit tests

69. By James Page

Tidy test a bit

Revision history for this message
Liam Young (gnuoy) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches