From 564b29b11fbfcdf15c9ad16de1f38c0ad8c173cc Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Mon, 3 Feb 2014 16:19:05 +1300 Subject: [PATCH] Permit setting ml2 flat networks in Neutron. This is needed to deploy the ci features in the overcloud - access to the bare metal LAN. Change-Id: I9fa923b63033edb694720bfe5fc756a7c0fbfd2a --- elements/neutron/README.md | 1 + .../os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini | 3 +++ 2 files changed, 4 insertions(+) diff --git a/elements/neutron/README.md b/elements/neutron/README.md index aee13f47b..69e4a3313 100644 --- a/elements/neutron/README.md +++ b/elements/neutron/README.md @@ -10,3 +10,4 @@ neutron: debug: False - Print debugging output (set logging level to DEBUG instead of default WARNING level). + flat-networks: "tripleo-bm-test" diff --git a/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini b/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini index 89b65369f..4b383650d 100644 --- a/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini +++ b/elements/neutron/os-apply-config/etc/neutron/plugins/ml2/ml2_conf.ini @@ -4,6 +4,9 @@ mechanism_drivers = openvswitch tenant_network_types = {{neutron.ovs.tenant_network_type}} [ml2_type_flat] +{{#neutron.flat-networks}} +flat_networks={{neutron.flat-networks}} +{{/neutron.flat-networks}} [ml2_type_vlan]