From 803282f97c884bc2d0eb7f869c0f914aa3735b18 Mon Sep 17 00:00:00 2001 From: Artur Korzeniewski Date: Sat, 1 Apr 2017 18:41:13 +0200 Subject: [PATCH] Improve neutron chart with vxlan support. (#288) * Improve neutron chart with vxlan support. Added VLAN and VXLAN as possible tenant networking options. Also, changed default tenant network type to VXLAN. Creation of flat networking is still possible. * Add helm-toolkit to joinListWithComma * Return to flat as default tenant network. --- neutron/templates/etc/_ml2-conf.ini.tpl | 1 + neutron/values.yaml | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/neutron/templates/etc/_ml2-conf.ini.tpl b/neutron/templates/etc/_ml2-conf.ini.tpl index d3339ae71f..4c1adab5e1 100644 --- a/neutron/templates/etc/_ml2-conf.ini.tpl +++ b/neutron/templates/etc/_ml2-conf.ini.tpl @@ -17,6 +17,7 @@ type_drivers = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.type_drivers }} tenant_network_types = {{ .Values.ml2.tenant_network_types }} mechanism_drivers = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.mechanism_drivers }} +extension_drivers = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.extension_drivers }} [ml2_type_flat] flat_networks = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.ml2_type_flat.flat_networks }} diff --git a/neutron/values.yaml b/neutron/values.yaml index b11edcdb9b..fddc039575 100644 --- a/neutron/values.yaml +++ b/neutron/values.yaml @@ -139,12 +139,16 @@ metadata: ml2: tenant_network_types: "flat" agent: - tunnel_types: null + tunnel_types: "vxlan" type_drivers: - flat + - vlan + - vxlan mechanism_drivers: - openvswitch - l2population + extension_drivers: + - port_security ml2_type_vxlan: vni_ranges: "1:1000" vxlan_group: 239.1.1.1