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

Proposed by James Page
Status: Merged
Merged at revision: 140
Proposed branch: lp:~james-page/charms/trusty/neutron-api/ml2-local-types
Merge into: lp:~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:~james-page/charms/trusty/neutron-api/ml2-local-types
Reviewer Review Type Date Requested Status
Ryan Beisner (community) Needs Resubmitting
Chris Glass (community) Approve
Review via email: mp+270498@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chris Glass (tribaal) wrote :

Looks good! +1

Thanks for the fast response.

review: Approve
Revision history for this message
Ryan Beisner (1chb1n) wrote :

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 :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/icehouse/ml2_conf.ini'
2--- templates/icehouse/ml2_conf.ini 2015-06-08 12:50:27 +0000
3+++ templates/icehouse/ml2_conf.ini 2015-09-09 08:39:15 +0000
4@@ -8,8 +8,8 @@
5 type_drivers = local,flat
6 mechanism_drivers = calico
7 {% else -%}
8-type_drivers = {{ overlay_network_type }},vlan,flat
9-tenant_network_types = {{ overlay_network_type }},vlan,flat
10+type_drivers = {{ overlay_network_type }},vlan,flat,local
11+tenant_network_types = {{ overlay_network_type }},vlan,flat,local
12 mechanism_drivers = openvswitch,hyperv,l2population
13
14 [ml2_type_gre]
15
16=== modified file 'templates/kilo/ml2_conf.ini'
17--- templates/kilo/ml2_conf.ini 2015-06-16 09:13:13 +0000
18+++ templates/kilo/ml2_conf.ini 2015-09-09 08:39:15 +0000
19@@ -8,8 +8,8 @@
20 type_drivers = local,flat
21 mechanism_drivers = calico
22 {% else -%}
23-type_drivers = {{ overlay_network_type }},vlan,flat
24-tenant_network_types = {{ overlay_network_type }},vlan,flat
25+type_drivers = {{ overlay_network_type }},vlan,flat,local
26+tenant_network_types = {{ overlay_network_type }},vlan,flat,local
27 mechanism_drivers = openvswitch,l2population
28
29 [ml2_type_gre]

Subscribers

People subscribed via source and target branches