Tidy templates

config.yaml

@@ -29,3 +29,7 @@ options:
         vxlan
       .
       Multiple types can be provided - field is space delimited.
+  security-groups:
+    default: false
+    type: boolean
+    description: Enable OpenDayLight managed security groups.

hooks/odl_data.py

@@ -85,6 +85,7 @@ class ConfigTranslation(dict):
         self['use_syslog'] = config('use-syslog')
         self['vlan_ranges'] = config('vlan-ranges')
         self['overlay_network_type'] = self.get_overlay_network_type()
+        self['security_groups'] = config('security-groups')
 
     def get_overlay_network_type(self):
         overlay_networks = config('overlay-network-type').split()

templates/icehouse/ml2_conf.ini

@@ -1,12 +1,12 @@
-# kilo
+# icehouse
 ###############################################################################
 # [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.  
+# Configuration file maintained by Juju. Local changes may be overwritten.
 ###############################################################################
 [ml2]
 type_drivers = {{ overlay_network_type }},local,flat,vlan,gre
 tenant_network_types = {{ overlay_network_type }}
-mechanism_drivers = opendaylight 
+mechanism_drivers = opendaylight
 
 [ml2_type_flat]
 # Provider nets only
@@ -20,11 +20,14 @@ tunnel_id_ranges = 1:1000
 [ml2_type_vxlan]
 vni_ranges = 1001:2000
 
-[securitygroup]
-firewall_driver = neutron.agent.linux.firewall.NoopFirewallDriver
-enable_security_group = False
-
 [ml2_odl]
 url = http://{{ odl_ip }}:{{ odl_port }}/controller/nb/v2/neutron
 username = {{ odl_username }}
 password = {{ odl_password }}
+
+[securitygroup]
+{% if security_groups -%}
+enable_security_group = True
+{% else -%}
+enable_security_group = False
+{% endif -%}

templates/icehouse/neutron.conf

@@ -1,40 +0,0 @@
-# icehouse
-###############################################################################
-# [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.
-# Config managed by neutron-openvswitch charm
-###############################################################################
-[DEFAULT]
-verbose = {{ verbose }}
-debug = {{ debug }}
-use_syslog = {{ use_syslog }}
-state_path = /var/lib/neutron
-lock_path = $state_path/lock
-bind_host = 0.0.0.0
-bind_port = 9696
-{% if network_device_mtu -%}
-network_device_mtu = {{ network_device_mtu }}
-{% endif -%}
-{% if core_plugin -%}
-core_plugin =  {{ core_plugin }}
-{% endif -%}
-
-api_paste_config = /etc/neutron/api-paste.ini
-auth_strategy = keystone
-{% if notifications == 'True' -%}
-notification_driver = neutron.openstack.common.notifier.rpc_notifier
-{% endif -%}
-default_notification_level = INFO
-notification_topics = notifications
-
-{% include "parts/rabbitmq" %}
-
-[QUOTAS]
-
-[DEFAULT_SERVICETYPE]
-
-[AGENT]
-root_helper = sudo neutron-rootwrap /etc/neutron/rootwrap.conf
-
-[keystone_authtoken]
-signing_dir = /var/lib/neutron/keystone-signing

templates/kilo/ml2_conf.ini

@@ -1,13 +1,19 @@
 # kilo
 ###############################################################################
 # [ WARNING ]
-# Configuration file maintained by Juju. Local changes may be overwritten.  
+# Configuration file maintained by Juju. Local changes may be overwritten.
 ###############################################################################
 [ml2]
 type_drivers = {{ overlay_network_type }}
-tenant_network_types = vxlan
+tenant_network_types = {{ overlay_network_type }}
 mechanism_drivers = opendaylight
 
+[ml2_type_flat]
+# Provider nets only
+
+[ml2_type_vlan]
+# Provider nets only
+
 [ml2_type_gre]
 tunnel_id_ranges = 1:1000
 
@@ -19,12 +25,9 @@ username = {{ odl_username }}
 password = {{ odl_password }}
 url = http://{{ odl_ip }}:{{ odl_port }}/controller/nb/v2/neutron
 
-[agent]
-tunnel_types = {{ overlay_network_type }}
-{% if veth_mtu -%}
-veth_mtu = {{ veth_mtu }}
-{% endif %}
-
 [securitygroup]
-firewall_driver = neutron.agent.linux.firewall.NoopFirewallDriver
+{% if security_groups -%}
+enable_security_group = True
+{% else -%}
 enable_security_group = False
+{% endif -%}

templates/parts/rabbitmq

@@ -1,21 +0,0 @@
-{% if rabbitmq_host or rabbitmq_hosts -%}
-rabbit_userid = {{ rabbitmq_user }}
-rabbit_virtual_host = {{ rabbitmq_virtual_host }}
-rabbit_password = {{ rabbitmq_password }}
-{% if rabbitmq_hosts -%}
-rabbit_hosts = {{ rabbitmq_hosts }}
-{% if rabbitmq_ha_queues -%}
-rabbit_ha_queues = True
-rabbit_durable_queues = False
-{% endif -%}
-{% else -%}
-rabbit_host = {{ rabbitmq_host }}
-{% endif -%}
-{% if rabbit_ssl_port -%}
-rabbit_use_ssl = True
-rabbit_port = {{ rabbit_ssl_port }}
-{% if rabbit_ssl_ca -%}
-kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
-{% endif -%}
-{% endif -%}
-{% endif -%}