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

[James Page]

[lp:~james-page/charms/trusty/nova-compute/l2pop]

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

=== 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 @@
           juju-myservice-0
       If you're running multiple environments with the same services in them
       this allows you to differentiate between them.
+  disable-neutron-security-groups:
+    type: boolean
+    description: |
+      Disable neutron based security groups - setting this configuration option
+      will override any settings configured via the nova-cloud-controller charm.
+      .
+      BE CAREFUL - this option allows you to disable all port level security within
+      and OpenStack cloud.

=== 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 @@
 
         ovs_ctxt['local_ip'] = get_host_ip(unit_get('private-address'))
         return ovs_ctxt
+
+    def __call__(self):
+        ctxt = super(NeutronComputeContext,self).__call__()
+        # NOTE(jamespage) support override of neutron security via config
+        if config('disable-neutron-security-groups') is not None:
+            ctxt['disable_neutron_security_groups'] = config('disable-neutron-security-groups')
+        return ctxt    

=== 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 @@
 [ml2]
 type_drivers = gre,vxlan
 tenant_network_types = gre,vxlan
-mechanism_drivers = openvswitch
+mechanism_drivers = openvswitch,l2population
 
 [ml2_type_gre]
 tunnel_id_ranges = 1:1000
@@ -19,10 +19,11 @@
 local_ip = {{ local_ip }}
 
 [agent]
-tunnel_types = gre
+tunnel_types = gre,vxlan
+l2_population = True
 
 [securitygroup]
-{% if neutron_security_groups -%}
+{% if neutron_security_groups and not disable_neutron_security_groups -%}
 enable_security_group = True
 firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
 {% else -%}