openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Kilofication of Neutron playbooks

Browse Source 
Update neutron config and template files for Kilo release

Partially implements: blueprint master-kilofication

Change-Id: Ifeba7162ca935c86cdbaa2dac6f021af328b92bf
This commit is contained in:
Tom Cameron 2015-04-10 16:49:45 -04:00
parent dc7df7aba2
commit 1a2793eb3a
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/rootwrap.d/linuxbridge-plugin.filters
View File

@ -16,4 +16,5 @@ bridge: CommandFilter, bridge, root
# ip_lib # ip_lib
ip: IpFilter, ip, root ip: IpFilter, ip, root
find: RegExpFilter, find, root, find, /sys/class/net, -maxdepth, 1, -type, l, -printf, %.*
ip_exec: IpNetnsExecFilter, ip, root ip_exec: IpNetnsExecFilter, ip, root

1
files/rootwrap.d/openvswitch-plugin.filters
View File

@ -19,4 +19,5 @@ xe: CommandFilter, xe, root
# ip_lib # ip_lib
ip: IpFilter, ip, root ip: IpFilter, ip, root
find: RegExpFilter, find, root, find, /sys/class/net, -maxdepth, 1, -type, l, -printf, %.*
ip_exec: IpNetnsExecFilter, ip, root ip_exec: IpNetnsExecFilter, ip, root

3
templates/neutron.conf.j2
View File

@ -14,6 +14,7 @@ log_file = /var/log/neutron/neutron.log
auth_strategy = keystone auth_strategy = keystone
network_device_mtu = {{ neutron_network_device_mtu }} network_device_mtu = {{ neutron_network_device_mtu }}
allow_overlapping_ips = True allow_overlapping_ips = True
vlan_transparent = False
## Drivers ## Drivers
@ -59,7 +60,7 @@ dhcp_agent_notification = True
dhcp_agents_per_network = {{ groups['neutron_agent'] | length }} dhcp_agents_per_network = {{ groups['neutron_agent'] | length }}
dhcp_delete_namespaces = True dhcp_delete_namespaces = True
dhcp_lease_duration = 86400 dhcp_lease_duration = 86400
advertise_mtu = False
## Notifications ## Notifications
notify_nova_on_port_status_changes = True notify_nova_on_port_status_changes = True

2
templates/plugins/ml2/ml2_conf.ini.j2
View File

@ -4,6 +4,8 @@
type_drivers = {{ neutron_ml2_drivers_type }} type_drivers = {{ neutron_ml2_drivers_type }}
tenant_network_types = {{ neutron_provider_networks.network_types }} tenant_network_types = {{ neutron_provider_networks.network_types }}
mechanism_drivers = {{ neutron_ml2_mechanism_drivers }} mechanism_drivers = {{ neutron_ml2_mechanism_drivers }}
path_mtu = 0
segment_mtu = 0
{% if neutron_provider_networks.network_flat_networks %} {% if neutron_provider_networks.network_flat_networks %}