openstack/charm-neutron-openvswitch
Code Issues Proposed changes

Tidyup templates and add comment to templates to say whose managing the file

Browse Source
This commit is contained in:
Liam Young 2014-06-11 09:48:07 +00:00
parent c8e783883f
commit fdfaf687a5
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
templates/havana/ovs_neutron_plugin.ini
View File

@ -1,19 +0,0 @@
# havana
###############################################################################
# [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten.
###############################################################################
[OVS]
tunnel_id_ranges = 1:1000
tenant_network_type = gre
enable_tunneling = True
local_ip = {{ local_ip }}
[AGENT]
polling_interval = 2
[SECURITYGROUP]
{% if neutron_security_groups -%}
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
{% endif -%}

1
templates/icehouse/ml2_conf.ini
View File

@ -2,6 +2,7 @@
###############################################################################
# [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten.
# Config managed by neutron-openvswitch charm
###############################################################################
[ml2]
type_drivers = gre,vxlan

1
templates/havana/neutron.conf → templates/icehouse/neutron.conf
View File

@ -2,6 +2,7 @@
###############################################################################
# [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten.
# Config managed by neutron-openvswitch charm
###############################################################################
[DEFAULT]
state_path = /var/lib/neutron