Juju Charms Collection
quantum-gateway package

Merge lp:~james-page/charms/trusty/quantum-gateway/l2pop into lp:~openstack-charmers/charms/trusty/quantum-gateway/next

  1. Trusty Tahr (14.04)
  2. l2pop
  3. Merge into next
Proposed by James Page
Status: Rejected
Rejected by: James Page
Proposed branch: lp:~james-page/charms/trusty/quantum-gateway/l2pop
Merge into: lp:~openstack-charmers/charms/trusty/quantum-gateway/next
Diff against target: 21 lines (+3/-2)
1 file modified
templates/icehouse/ml2_conf.ini (+3/-2)
To merge this branch: bzr merge lp:~james-page/charms/trusty/quantum-gateway/l2pop
Reviewer Review Type Date Requested Status
OpenStack Charmers Pending
Review via email: mp+223368@code.launchpad.net
To post a comment you must log in.
lp:~james-page/charms/trusty/quantum-gateway/l2pop updated
54. By James Page

Add vxlan to supported tunnel types

Unmerged revisions

54. By James Page

Add vxlan to supported tunnel types

53. By James Page

Enable l2 pop as well

52. By James Page

Enable l2population driver for ml2 plugin in icehouse

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 2014-03-31 22:23:32 +0000
3+++ templates/icehouse/ml2_conf.ini 2014-06-17 12:42:26 +0000
4@@ -5,7 +5,7 @@
5 [ml2]
6 type_drivers = gre,vxlan
7 tenant_network_types = gre,vxlan
8-mechanism_drivers = openvswitch
9+mechanism_drivers = openvswitch,l2population
10 [ml2_type_gre]
11 tunnel_id_ranges = 1:1000
12 [ml2_type_vxlan]
13@@ -14,6 +14,7 @@
14 enable_tunneling = True
15 local_ip = {{ local_ip }}
16 [agent]
17-tunnel_types = gre
18+tunnel_types = gre,vxlan
19+l2_population = True
20 [securitygroup]
21 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver

Subscribers

People subscribed via source and target branches