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
=== modified file 'config.yaml'
--- config.yaml 2014-03-31 15:24:56 +0000
+++ config.yaml 2014-06-17 12:41:46 +0000
@@ -105,3 +105,11 @@
105 juju-myservice-0105 juju-myservice-0
106 If you're running multiple environments with the same services in them106 If you're running multiple environments with the same services in them
107 this allows you to differentiate between them.107 this allows you to differentiate between them.
108 disable-neutron-security-groups:
109 type: boolean
110 description: |
111 Disable neutron based security groups - setting this configuration option
112 will override any settings configured via the nova-cloud-controller charm.
113 .
114 BE CAREFUL - this option allows you to disable all port level security within
115 and OpenStack cloud.
108116
=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py 2014-04-04 16:45:38 +0000
+++ hooks/nova_compute_context.py 2014-06-17 12:41:46 +0000
@@ -346,3 +346,10 @@
346346
347 ovs_ctxt['local_ip'] = get_host_ip(unit_get('private-address'))347 ovs_ctxt['local_ip'] = get_host_ip(unit_get('private-address'))
348 return ovs_ctxt348 return ovs_ctxt
349
350 def __call__(self):
351 ctxt = super(NeutronComputeContext,self).__call__()
352 # NOTE(jamespage) support override of neutron security via config
353 if config('disable-neutron-security-groups') is not None:
354 ctxt['disable_neutron_security_groups'] = config('disable-neutron-security-groups')
355 return ctxt
349356
=== modified file 'templates/icehouse/ml2_conf.ini'
--- templates/icehouse/ml2_conf.ini 2014-04-14 09:11:10 +0000
+++ templates/icehouse/ml2_conf.ini 2014-06-17 12:41:46 +0000
@@ -6,7 +6,7 @@
6[ml2]6[ml2]
7type_drivers = gre,vxlan7type_drivers = gre,vxlan
8tenant_network_types = gre,vxlan8tenant_network_types = gre,vxlan
9mechanism_drivers = openvswitch9mechanism_drivers = openvswitch,l2population
1010
11[ml2_type_gre]11[ml2_type_gre]
12tunnel_id_ranges = 1:100012tunnel_id_ranges = 1:1000
@@ -19,10 +19,11 @@
19local_ip = {{ local_ip }}19local_ip = {{ local_ip }}
2020
21[agent]21[agent]
22tunnel_types = gre22tunnel_types = gre,vxlan
23l2_population = True
2324
24[securitygroup]25[securitygroup]
25{% if neutron_security_groups -%}26{% if neutron_security_groups and not disable_neutron_security_groups -%}
26enable_security_group = True27enable_security_group = True
27firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver28firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
28{% else -%}29{% else -%}

Subscribers

People subscribed via source and target branches