Merge lp:~james-page/charms/precise/nova-cloud-controller/vmware-nsx into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next
Proposed by
James Page
Status: | Merged |
---|---|
Merged at revision: | 79 |
Proposed branch: | lp:~james-page/charms/precise/nova-cloud-controller/vmware-nsx |
Merge into: | lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next |
Diff against target: |
97 lines (+24/-12) 4 files modified
config.yaml (+11/-10) hooks/nova_cc_context.py (+1/-1) templates/icehouse/neutron.conf (+1/-1) templates/icehouse/nsx.ini (+11/-0) |
To merge this branch: | bzr merge lp:~james-page/charms/precise/nova-cloud-controller/vmware-nsx |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Liam Young (community) | Approve | ||
Review via email: mp+221684@code.launchpad.net |
This proposal supersedes a proposal from 2014-05-21.
Description of the change
Fixup support for NSX (renamed from NVP) in Icehouse
To post a comment you must log in.
[1] "neutron- plugin" ) as well?
Lines 66 and 67 in the diff are not equivalent: are we sure we won't have to check in config(
I would defensively add the check as well, like:
in_quantum = config( 'quantum- plugin' ) in ['nvp', 'nsx'] 'neutron- plugin' ) in ['nvp', 'nsx']
in_neutron = config(
if in_quantum or in_neutron:
...