Merge lp:~james-page/charms/trusty/nova-compute/l2pop into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

Proposed by James Page on 2014-06-17
Status: Rejected
Rejected by: James Page on 2014-10-06
Proposed branch: lp:~james-page/charms/trusty/nova-compute/l2pop
Merge into: lp:~openstack-charmers-archive/charms/trusty/nova-compute/next
Diff against target: 57 lines (+19/-3)
3 files modified
config.yaml (+8/-0)
hooks/nova_compute_context.py (+7/-0)
templates/icehouse/ml2_conf.ini (+4/-3)
To merge this branch: bzr merge lp:~james-page/charms/trusty/nova-compute/l2pop
Reviewer Review Type Date Requested Status
OpenStack Charmers 2014-06-17 Pending
Review via email: mp+223367@code.launchpad.net
To post a comment you must log in.
68. By James Page on 2014-06-17

Add vxlan to supported tunnel types

Unmerged revisions

68. By James Page on 2014-06-17

Add vxlan to supported tunnel types

67. By James Page on 2014-06-17

Merge in disable security option

66. By James Page on 2014-06-17

Enable l2pop as well

65. By James Page on 2014-06-17

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 'config.yaml'
2--- config.yaml 2014-03-31 15:24:56 +0000
3+++ config.yaml 2014-06-17 12:41:46 +0000
4@@ -105,3 +105,11 @@
5 juju-myservice-0
6 If you're running multiple environments with the same services in them
7 this allows you to differentiate between them.
8+ disable-neutron-security-groups:
9+ type: boolean
10+ description: |
11+ Disable neutron based security groups - setting this configuration option
12+ will override any settings configured via the nova-cloud-controller charm.
13+ .
14+ BE CAREFUL - this option allows you to disable all port level security within
15+ and OpenStack cloud.
16
17=== modified file 'hooks/nova_compute_context.py'
18--- hooks/nova_compute_context.py 2014-04-04 16:45:38 +0000
19+++ hooks/nova_compute_context.py 2014-06-17 12:41:46 +0000
20@@ -346,3 +346,10 @@
21
22 ovs_ctxt['local_ip'] = get_host_ip(unit_get('private-address'))
23 return ovs_ctxt
24+
25+ def __call__(self):
26+ ctxt = super(NeutronComputeContext,self).__call__()
27+ # NOTE(jamespage) support override of neutron security via config
28+ if config('disable-neutron-security-groups') is not None:
29+ ctxt['disable_neutron_security_groups'] = config('disable-neutron-security-groups')
30+ return ctxt
31
32=== modified file 'templates/icehouse/ml2_conf.ini'
33--- templates/icehouse/ml2_conf.ini 2014-04-14 09:11:10 +0000
34+++ templates/icehouse/ml2_conf.ini 2014-06-17 12:41:46 +0000
35@@ -6,7 +6,7 @@
36 [ml2]
37 type_drivers = gre,vxlan
38 tenant_network_types = gre,vxlan
39-mechanism_drivers = openvswitch
40+mechanism_drivers = openvswitch,l2population
41
42 [ml2_type_gre]
43 tunnel_id_ranges = 1:1000
44@@ -19,10 +19,11 @@
45 local_ip = {{ local_ip }}
46
47 [agent]
48-tunnel_types = gre
49+tunnel_types = gre,vxlan
50+l2_population = True
51
52 [securitygroup]
53-{% if neutron_security_groups -%}
54+{% if neutron_security_groups and not disable_neutron_security_groups -%}
55 enable_security_group = True
56 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
57 {% else -%}

Subscribers

People subscribed via source and target branches