Merge lp://qastaging/~bjornt/charms/trusty/neutron-api/backport-next-140 into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk
Proposed by
Björn Tillenius
| Status: | Merged |
|---|---|
| Merged at revision: | 117 |
| Proposed branch: | lp://qastaging/~bjornt/charms/trusty/neutron-api/backport-next-140 |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/trunk |
| Diff against target: |
29 lines (+4/-4) 2 files modified
templates/icehouse/ml2_conf.ini (+2/-2) templates/kilo/ml2_conf.ini (+2/-2) |
| To merge this branch: | bzr merge lp://qastaging/~bjornt/charms/trusty/neutron-api/backport-next-140 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ryan Beisner (community) | Needs Resubmitting | ||
| charmers | Pending | ||
|
Review via email:
|
|||
Description of the change
Backport r140 from the /next branch.
Add local network driver type to defaults.
To post a comment you must log in.
Revision history for this message
| Björn Tillenius (bjornt) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Grrr. This also broke the stable charm's amulet test, and would have had a failing amulet test result posted back here automatically, given a bit of time. ;-)
00:17:27.678 2015-09-10 01:54:44,934 validate_
00:17:27.678 ml2 config error: section [ml2] type_drivers:
A corresponding amulet test update is needed.