From e6f78fe6aa9593e9d1ed80c08d7014e8074675aa Mon Sep 17 00:00:00 2001 From: Elena Ezhova Date: Tue, 24 Jan 2017 15:30:22 +0400 Subject: [PATCH] Support various tenant network types Currently CCP supports only VxLAN network segmentation type. This change adds a new config parameter `tenant_network_types` that allows to specify different allowed network types like `vlan`, `vxlan` or several of them at once, with `vxlan` as the default one. Change-Id: Idcea3f6047c9b06f5fd025de3d38d4dd6153d31c --- service/files/defaults.yaml | 3 +++ service/files/ml2_conf.ini.j2 | 2 +- service/neutron-l3-agent.yaml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml index 6454662..396de81 100644 --- a/service/files/defaults.yaml +++ b/service/files/defaults.yaml @@ -8,6 +8,9 @@ configs: cont: 9696 ingress: network core_plugin: "ml2" + ml2: + tenant_network_types: + - "vxlan" physnets: - name: "physnet1" bridge_name: "br-ex" diff --git a/service/files/ml2_conf.ini.j2 b/service/files/ml2_conf.ini.j2 index 0cf1834..9ae1fb8 100644 --- a/service/files/ml2_conf.ini.j2 +++ b/service/files/ml2_conf.ini.j2 @@ -6,7 +6,7 @@ type_drivers = local, flat tenant_network_types = local {% else %} type_drivers = flat,vlan,vxlan -tenant_network_types = vxlan +tenant_network_types = {{ neutron.ml2.tenant_network_types|join(',') }} {% endif %} {% if neutron.plugin_agent == "openvswitch" %} diff --git a/service/neutron-l3-agent.yaml b/service/neutron-l3-agent.yaml index 515821d..d0e1a16 100644 --- a/service/neutron-l3-agent.yaml +++ b/service/neutron-l3-agent.yaml @@ -37,7 +37,7 @@ service: type: single dependencies: - neutron-server - command: neutron --os-endpoint-type internal net-create --provider:network_type vxlan --provider:segmentation_id 77 {{ int.net_name }} + command: neutron --os-endpoint-type internal net-create {{ int.net_name }} # {% endif %} - name: neutron-bootstrap-int-net-subnetpool-create type: single