openstack/openstack-helm
Code Issues Proposed changes

Improve neutron chart with vxlan support. (#288)

Browse Source 
* 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.
This commit is contained in:
Artur Korzeniewski 2017-04-01 18:41:13 +02:00 committed by Alan Meadows
parent afcf1c9848
commit 803282f97c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/templates/etc/_ml2-conf.ini.tpl
View File

@ -17,6 +17,7 @@
type_drivers = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.type_drivers }} type_drivers = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.type_drivers }}
tenant_network_types = {{ .Values.ml2.tenant_network_types }} tenant_network_types = {{ .Values.ml2.tenant_network_types }}
mechanism_drivers = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.mechanism_drivers }} mechanism_drivers = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.mechanism_drivers }}
extension_drivers = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.extension_drivers }}
[ml2_type_flat] [ml2_type_flat]
flat_networks = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.ml2_type_flat.flat_networks }} flat_networks = {{ include "helm-toolkit.joinListWithComma" .Values.ml2.ml2_type_flat.flat_networks }}

6
neutron/values.yaml
View File

@ -139,12 +139,16 @@ metadata:
ml2: ml2:
tenant_network_types: "flat" tenant_network_types: "flat"
agent: agent:
tunnel_types: null tunnel_types: "vxlan"
type_drivers: type_drivers:
- flat - flat
- vlan
- vxlan
mechanism_drivers: mechanism_drivers:
- openvswitch - openvswitch
- l2population - l2population
extension_drivers:
- port_security
ml2_type_vxlan: ml2_type_vxlan:
vni_ranges: "1:1000" vni_ranges: "1:1000"
vxlan_group: 239.1.1.1 vxlan_group: 239.1.1.1