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
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.
45. By Michał Sawicz

Clarify the warning

46. By Michał Sawicz

Do not back up our own configs

47. By Michał Sawicz

Fix config var name

48. By Michał Sawicz

Change ifdown order, otherwise vif tries to delete interfaces that are already down

49. By Michał Sawicz

Fix vhost-phys.sh script

50. By Michał Sawicz

Take down vhost0, agent and toggle module before configuring vrouter

Otherwise `vif --add` has no effect and networking is gone

51. By Michał Sawicz

Merge trunk

52. By Michał Sawicz

Need to start the service in case the physical interface does not change

Revision history for this message
Robert Ayres (robert-ayres) wrote :

Merged with some reworkings.

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