Juju Charms Collection
neutron-api package

Merge lp://qastaging/~james-page/charms/trusty/neutron-api/ml2-local-types into lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next

Proposed by James Page on 2015-09-09

Status:	Merged
Merged at revision:	140
Proposed branch:	lp://qastaging/~james-page/charms/trusty/neutron-api/ml2-local-types
Merge into:	lp://qastaging/~openstack-charmers-archive/charms/trusty/neutron-api/next
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/~james-page/charms/trusty/neutron-api/ml2-local-types
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Ryan Beisner (community)		Needs Resubmitting on 2015-09-10
Chris Glass (community)	2015-09-09	Approve on 2015-09-09
Review via email: mp+270498@code.qastaging.launchpad.net

Revision history for this message

Chris Glass (tribaal) wrote on 2015-09-09:

Looks good! +1

Thanks for the fast response.

review: Approve

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2015-09-10:

Grrr. This broke the 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_config_data DEBUG: Validating config file data (ml2 in /etc/neutron/plugins/ml2/ml2_conf.ini on neutron-api/0)...

00:17:27.678 ml2 config error: section [ml2] type_drivers:gre,vlan,flat,local != expected type_drivers:gre,vlan,flat

A corresponding amulet test update is needed.

review: Needs Resubmitting

Revision history for this message

Björn Tillenius (bjornt) wrote on 2015-09-10:

MP for fixing those tests: https://code.launchpad.net/~bjornt/charms/trusty/neutron-api/next-r140-amulet-fixes/+merge/270630