aaedb4a150
Adding daemonset for Linux bridge. Using node selector "linuxbridge enabled". network.backend added in neutron/values.yaml to support scenario for different SDNs using the same networking software, like OVS is used for reference Neutron L2 agent, ODL, OVN and SONA. The other option for network.backend can be linuxbridge and calico. network.backend impacts configuration of DHCP, L3 and metadata agents. Those agents are dependent on ovsdb_connection flag (officially it is placed in openvswitch_agent.ini file). Added daemonset_lb_agent flag in manifests section. Currently OVS and LinuxBridge L2 agents can be turned on/off to be deployed. OVS L2 agent and OVS as a network virtualization SW can be deployed independently. Removed conf.neutron.default.neutron.interface_driver, since it was not used anywhere. Marked places in neutron/values.yaml where changes are needed in order to use linuxbridge for: - neutron.conf interface_driver - ML2 mechanism driver - dhcp and l3 agents interface_driver Added example of neutron values overrides in: tools/overrides/mvp/neutron-linuxbridge.yaml Change-Id: I7cdcfaa9a73af392a0d45f7df29b7b3ae3cc4c76 Implements: blueprint support-linux-bridge-on-neutron
239 lines
9.7 KiB
YAML
239 lines
9.7 KiB
YAML
{{/*
|
|
Copyright 2017 The Openstack-Helm Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/}}
|
|
|
|
{{- if .Values.manifests.daemonset_lb_agent }}
|
|
{{- $envAll := . }}
|
|
{{- $dependencies := .Values.dependencies.lb_agent }}
|
|
{{- $mounts_neutron_lb_agent := .Values.pod.mounts.neutron_lb_agent.neutron_lb_agent }}
|
|
{{- $mounts_neutron_lb_agent_init := .Values.pod.mounts.neutron_lb_agent.init_container }}
|
|
---
|
|
apiVersion: extensions/v1beta1
|
|
kind: DaemonSet
|
|
metadata:
|
|
name: lb-agent
|
|
spec:
|
|
{{ tuple $envAll "lb_agent" | include "helm-toolkit.snippets.kubernetes_upgrades_daemonset" | indent 2 }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
{{ tuple $envAll "neutron" "lb-agent" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
|
annotations:
|
|
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
spec:
|
|
nodeSelector:
|
|
{{ .Values.labels.lb.node_selector_key }}: {{ .Values.labels.lb.node_selector_value }}
|
|
dnsPolicy: ClusterFirstWithHostNet
|
|
hostNetwork: true
|
|
initContainers:
|
|
{{ tuple $envAll $dependencies $mounts_neutron_lb_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
- name: lb-agent-init
|
|
image: {{ .Values.images.neutron_linuxbridge_agent }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.agent.lb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
securityContext:
|
|
privileged: true
|
|
runAsUser: 0
|
|
command:
|
|
- /tmp/neutron-linuxbridge-agent-init.sh
|
|
volumeMounts:
|
|
- name: neutron-bin
|
|
mountPath: /tmp/neutron-linuxbridge-agent-init.sh
|
|
subPath: neutron-linuxbridge-agent-init.sh
|
|
readOnly: true
|
|
- name: pod-shared
|
|
mountPath: /tmp/pod-shared
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/neutron.conf
|
|
subPath: neutron.conf
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
|
|
subPath: ml2_conf.ini
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/linuxbridge_agent.ini
|
|
subPath: linuxbridge_agent.ini
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
# NOTE (Portdirect): We mount here to overide Kollas custom
|
|
# sudoers file when using Kolla images, this location will
|
|
# also work fine for other images.
|
|
mountPath: /etc/sudoers.d/kolla_neutron_sudoers
|
|
subPath: neutron_sudoers
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.conf
|
|
subPath: rootwrap.conf
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/debug.filters
|
|
subPath: debug.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/dibbler.filters
|
|
subPath: dibbler.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/ipset-firewall.filters
|
|
subPath: ipset-firewall.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/l3.filters
|
|
subPath: l3.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/netns-cleanup.filters
|
|
subPath: netns-cleanup.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/dhcp.filters
|
|
subPath: dhcp.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/ebtables.filters
|
|
subPath: ebtables.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/iptables-firewall.filters
|
|
subPath: iptables-firewall.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/linuxbridge-plugin.filters
|
|
subPath: linuxbridge-plugin.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/openvswitch-plugin.filters
|
|
subPath: openvswitch-plugin.filters
|
|
readOnly: true
|
|
- name: libmodules
|
|
mountPath: /lib/modules
|
|
readOnly: true
|
|
- name: run
|
|
mountPath: /run
|
|
{{ if $mounts_neutron_lb_agent.volumeMounts }}{{ toYaml $mounts_neutron_lb_agent.volumeMounts | indent 12 }}{{ end }}
|
|
containers:
|
|
- name: lb-agent
|
|
image: {{ .Values.images.neutron_linuxbridge_agent }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
{{ tuple $envAll $envAll.Values.pod.resources.agent.lb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
|
|
securityContext:
|
|
runAsUser: {{ .Values.pod.user.neutron.uid }}
|
|
privileged: true
|
|
command:
|
|
- /tmp/neutron-linuxbridge-agent.sh
|
|
readinessProbe:
|
|
exec:
|
|
command:
|
|
- bash
|
|
- -c
|
|
- 'brctl show'
|
|
volumeMounts:
|
|
- name: neutron-bin
|
|
mountPath: /tmp/neutron-linuxbridge-agent.sh
|
|
subPath: neutron-linuxbridge-agent.sh
|
|
readOnly: true
|
|
- name: pod-shared
|
|
mountPath: /tmp/pod-shared
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/neutron.conf
|
|
subPath: neutron.conf
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
|
|
subPath: ml2_conf.ini
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/linuxbridge_agent.ini
|
|
subPath: linuxbridge_agent.ini
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
# NOTE (Portdirect): We mount here to overide Kollas custom
|
|
# sudoers file when using Kolla images, this location will
|
|
# also work fine for other images.
|
|
mountPath: /etc/sudoers.d/kolla_neutron_sudoers
|
|
subPath: neutron_sudoers
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.conf
|
|
subPath: rootwrap.conf
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/debug.filters
|
|
subPath: debug.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/dibbler.filters
|
|
subPath: dibbler.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/ipset-firewall.filters
|
|
subPath: ipset-firewall.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/l3.filters
|
|
subPath: l3.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/netns-cleanup.filters
|
|
subPath: netns-cleanup.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/dhcp.filters
|
|
subPath: dhcp.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/ebtables.filters
|
|
subPath: ebtables.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/iptables-firewall.filters
|
|
subPath: iptables-firewall.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/linuxbridge-plugin.filters
|
|
subPath: linuxbridge-plugin.filters
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/rootwrap.d/openvswitch-plugin.filters
|
|
subPath: openvswitch-plugin.filters
|
|
readOnly: true
|
|
- name: libmodules
|
|
mountPath: /lib/modules
|
|
readOnly: true
|
|
- name: run
|
|
mountPath: /run
|
|
{{ if $mounts_neutron_lb_agent.volumeMounts }}{{ toYaml $mounts_neutron_lb_agent.volumeMounts | indent 12 }}{{ end }}
|
|
volumes:
|
|
- name: pod-shared
|
|
emptyDir: {}
|
|
- name: neutron-bin
|
|
configMap:
|
|
name: neutron-bin
|
|
defaultMode: 0555
|
|
- name: neutron-etc
|
|
configMap:
|
|
name: neutron-etc
|
|
defaultMode: 0444
|
|
- name: libmodules
|
|
hostPath:
|
|
path: /lib/modules
|
|
- name: run
|
|
hostPath:
|
|
path: /run
|
|
{{ if $mounts_neutron_lb_agent.volumes }}{{ toYaml $mounts_neutron_lb_agent.volumes | indent 8 }}{{ end }}
|
|
{{- end }}
|