Merge lp://staging/~saviq/charms/trusty/neutron-contrail/config-vhost-interface into lp://staging/~sdn-charmers/charms/trusty/neutron-contrail/trunk
Proposed by
Michał Sawicz
Status: | Merged |
---|---|
Merged at revision: | 28 |
Proposed branch: | lp://staging/~saviq/charms/trusty/neutron-contrail/config-vhost-interface |
Merge into: | lp://staging/~sdn-charmers/charms/trusty/neutron-contrail/trunk |
Diff against target: |
312 lines (+178/-31) 7 files modified
config.yaml (+14/-0) hooks/neutron_contrail_hooks.py (+12/-0) hooks/neutron_contrail_utils.py (+11/-2) scripts/br-interfaces.awk (+35/-0) scripts/create-vrouter.sh (+93/-28) scripts/vhost-phys.awk (+12/-0) scripts/vhost-phys.sh (+1/-1) |
To merge this branch: | bzr merge lp://staging/~saviq/charms/trusty/neutron-contrail/config-vhost-interface |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Ayres (community) | Approve | ||
Review via email: mp+263129@code.staging.launchpad.net |
Commit message
Add fold-juju-bridge and optional vhost-interface config options to deal with more complex network configurations
To post a comment you must log in.
Merged with some reworkings.