← Back to branch summary

~openstack-charmers-next/charms/precise/nova-compute/trunk

« back to all changes in this revision

Viewing changes to templates/icehouse/ml2_conf.ini

  • Committer: James Page
  • Date: 2016-04-08 10:06:51 UTC
  • Revision ID: james.page@ubuntu.com-20160408100651-t18z7xdyuue1w1m4
Drop support for legacy Neutron management

The nova-compute charm originally managed the Neutron services
and configuration files for the hypervisor units; this has be
devolved into subordinate charms such as neutron-openvswitch
providing a nicer separation between Nova and Neutron.

Drop remaining legacy Neutron support from this charm as it was
deprecated for removal last cycle.

Change-Id: If3bd62d169c8e8804570c75e7311bf005c13683a

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/icehouse/ml2_conf.ini
1
 
# icehouse
2
 
###############################################################################
3
 
# [ WARNING ]
4
 
# Configuration file maintained by Juju. Local changes may be overwritten.
5
 
###############################################################################
6
 
[ml2]
7
 
type_drivers = gre,vxlan
8
 
tenant_network_types = gre,vxlan
9
 
mechanism_drivers = openvswitch
10
 
 
11
 
[ml2_type_gre]
12
 
tunnel_id_ranges = 1:1000
13
 
 
14
 
[ml2_type_vxlan]
15
 
vni_ranges = 1001:2000
16
 
 
17
 
[ovs]
18
 
enable_tunneling = True
19
 
local_ip = {{ local_ip }}
20
 
 
21
 
[agent]
22
 
tunnel_types = gre
23
 
 
24
 
[securitygroup]
25
 
{% if neutron_security_groups and not disable_neutron_security_groups -%}
26
 
enable_security_group = True
27
 
firewall_driver = neutron.agent.linux.iptables_firewall.OVSHybridIptablesFirewallDriver
28
 
{% else -%}
29
 
enable_security_group = False
30
 
{% endif -%}