openstack/openstack-helm
Code Issues Proposed changes

[neutron] Handle ML2 mechanism drivers

Browse Source 
* add l2pop driver only if vxlan mode is enabled
* use network:backend list as drivers source

Change-Id: If513c2664d465f53ff3756c27ecab0fc519f6a50
This commit is contained in:
Michael Polenchuk 2019-09-24 10:44:59 +04:00
parent ac84cbab52
commit 88575904c0
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/templates/configmap-etc.yaml
View File

@ -141,16 +141,10 @@ just set it along with nova_metadata_host.
{{- end -}} {{- end -}}
{{- if empty $envAll.Values.conf.plugins.ml2_conf.ml2.mechanism_drivers -}} {{- if empty $envAll.Values.conf.plugins.ml2_conf.ml2.mechanism_drivers -}}
{{- $_ := set $envAll.Values "__mechanism_drivers" ( list "l2population" ) }} {{- if (contains "vxlan" $envAll.Values.conf.plugins.ml2_conf.ml2.tenant_network_types) -}}
{{- if ( has "openvswitch" $envAll.Values.network.backend ) -}} {{- $_ := set $envAll.Values "__mechanism_drivers" (append $envAll.Values.network.backend "l2population") -}}
{{ $__mechanism_drivers := append $envAll.Values.__mechanism_drivers "openvswitch" }}
{{- $_ := set $envAll.Values "__mechanism_drivers" $__mechanism_drivers }}
{{- end -}} {{- end -}}
{{- if ( has "linuxbridge" $envAll.Values.network.backend ) -}} {{- $_ := set $envAll.Values.conf.plugins.ml2_conf.ml2 "mechanism_drivers" ($envAll.Values.__mechanism_drivers | default $envAll.Values.network.backend | uniq) -}}
{{ $__mechanism_drivers := append $envAll.Values.__mechanism_drivers "linuxbridge" }}
{{- $_ := set $envAll.Values "__mechanism_drivers" $__mechanism_drivers }}
{{- end -}}
{{- $_ := set $envAll.Values.conf.plugins.ml2_conf.ml2 "mechanism_drivers" $envAll.Values.__mechanism_drivers -}}
{{- end -}} {{- end -}}
{{- if empty .Values.conf.neutron.DEFAULT.bind_port -}} {{- if empty .Values.conf.neutron.DEFAULT.bind_port -}}

1
neutron/values.yaml
View File

@ -91,7 +91,6 @@ labels:
network: network:
# provide what type of network wiring will be used # provide what type of network wiring will be used
# possible options: openvswitch, linuxbridge, sriov
backend: backend:
- openvswitch - openvswitch
# NOTE(Portdirect): Share network namespaces with the host, # NOTE(Portdirect): Share network namespaces with the host,