summaryrefslogtreecommitdiffstats
path: root/deploy/adapters/ansible/openstack_juno/templates
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/adapters/ansible/openstack_juno/templates')
-rw-r--r--deploy/adapters/ansible/openstack_juno/templates/ml2_conf.ini13
1 files changed, 9 insertions, 4 deletions
diff --git a/deploy/adapters/ansible/openstack_juno/templates/ml2_conf.ini b/deploy/adapters/ansible/openstack_juno/templates/ml2_conf.ini
index a7900693..7b3e76da 100644
--- a/deploy/adapters/ansible/openstack_juno/templates/ml2_conf.ini
+++ b/deploy/adapters/ansible/openstack_juno/templates/ml2_conf.ini
@@ -29,7 +29,7 @@ mechanism_drivers = {{ NEUTRON_MECHANISM_DRIVERS |join(",") }}
# can be created. Use * to allow flat networks with arbitrary
# physical_network names.
#
-flat_networks = external
+flat_networks = *
# Example:flat_networks = physnet1,physnet2
# Example:flat_networks = *
@@ -39,7 +39,7 @@ flat_networks = external
# tenant networks, as well as ranges of VLAN tags on each
# physical_network available for allocation as tenant networks.
#
-network_vlan_ranges =
+network_vlan_ranges = {{ NEUTRON_VLAN_RANGES|join(",") }}
# Example: network_vlan_ranges = physnet1:1000:2999,physnet2
[ml2_type_gre]
@@ -73,10 +73,12 @@ connection = mysql://neutron:{{ NEUTRON_DBPASS }}@{{ db_host }}/neutron?charset=
local_ip = {{ internal_ip }}
{% if 'openvswitch' in NEUTRON_MECHANISM_DRIVERS %}
integration_bridge = br-int
+{% if NEUTRON_TUNNEL_TYPES %}
tunnel_bridge = br-tun
tunnel_id_ranges = 1001:4095
tunnel_type = {{ NEUTRON_TUNNEL_TYPES |join(",") }}
-bridge_mappings = {{ neutron_ovs_bridge_mappings | default("external:br-ex") }}
+{% endif %}
+bridge_mappings = {{ NEUTRON_OVS_BRIDGE_MAPPINGS | join(",") }}
{% endif %}
[agent]
@@ -90,11 +92,14 @@ l2_population = False
[odl]
{% if 'opendaylight' in NEUTRON_MECHANISM_DRIVERS %}
network_vlan_ranges = 1001:4095
+{% if NEUTRON_TUNNEL_TYPES %}
tunnel_id_ranges = 1001:4095
tun_peer_patch_port = patch-int
int_peer_patch_port = patch-tun
-tenant_network_type = vxlan
tunnel_bridge = br-tun
+{% endif %}
+
+tenant_network_type = {{ NEUTRON_TENANT_NETWORK_TYPES |join(",") }}
integration_bridge = br-int
controllers = 10.1.0.15:8080:admin:admin
{% endif %}