Adding support for mellanox driver for ubuntu

Incoporated the review comments Change-Id: I023bc2af0b2761d73b1d1e29a2ce31e113c69098 Closes-bug: #1783620
Juniper · Aug 7, 2018 · 4bc19c8 · 4bc19c8
1 parent 6a298a7
commit 4bc19c8
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml b/contrail-vrouter/templates/daemonset-vrouter-agent-dpdk.yaml
@@ -4,6 +4,7 @@
 # host_os is a mandatory field
 {{- $_ := required ".Values.global.node.host_os must be specified, valid values are ubuntu, centos" .Values.global.node.host_os }}
 {{- $host_os := .Values.global.node.host_os }}
+{{- $uio_driver := .Values.global.contrail_env_vrouter_dpdk.DPDK_UIO_DRIVER }}
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet
@@ -52,6 +53,21 @@ spec:
           volumeMounts:
           - mountPath: /host/usr/bin
             name: host-usr-bin
+{{- if and (eq $host_os "ubuntu") (eq $uio_driver "mlnx") }}
+        - name: contrail-vrouter-plugin-mellanox-init
+          image: {{ $context.Values.global.images.tags.vrouter_plugin_mellanox_init | quote }}
+          imagePullPolicy: {{ default "" $context.Values.global.images.imagePullPolicy | quote }}
+          securityContext:
+            privileged: true
+          envFrom:
+          - configMapRef:
+              name: contrail-vrouter-dpdk
+          volumeMounts:
+          - mountPath: /lib/modules
+            name: lib-modules
+          - mountPath: /usr/src
+            name: usr-src
+{{- end }}
         - name: contrail-vrouter-init-dpdk
           image: {{ .Values.global.images.tags.vrouter_init_dpdk | quote }}
           imagePullPolicy: {{ default "" .Values.global.images.imagePullPolicy | quote }}

diff --git a/contrail-vrouter/templates/daemonset-vrouter-agent-sriov.yaml b/contrail-vrouter/templates/daemonset-vrouter-agent-sriov.yaml
@@ -5,6 +5,7 @@
 {{- $sriov_env := index . 3 }}
 {{- $context := index . 4 }}
 {{- $agent_mode := $sriov_env.AGENT_MODE | default "kernel" }}
+{{- $uio_driver := $sriov_env.DPDK_UIO_DRIVER | default "kernel" }}
 
 {{- $_ := set $context.Values "images" $context.Values.global.images }}
 # host_os is a mandatory field
@@ -113,7 +114,22 @@ spec:
           - mountPath: /host/bin
             name: host-bin
 {{- end }}
-{{- else if and $agent_mode ( eq $agent_mode "dpdk" ) }}
+{{- else if and $agent_mode ( eq $agent_mode "dpdk" ) }} 
+{{- if and (eq $host_os "ubuntu") (eq $uio_driver "mlnx") }}
+        - name: contrail-vrouter-plugin-mellanox-init
+          image: {{ $context.Values.global.images.tags.vrouter_plugin_mellanox_init | quote }}
+          imagePullPolicy: {{ default "" $context.Values.global.images.imagePullPolicy | quote }}
+          securityContext:
+            privileged: true
+          envFrom:
+          - configMapRef:
+              name: contrail-vrouter-dpdk
+          volumeMounts:
+          - mountPath: /lib/modules
+            name: lib-modules
+          - mountPath: /usr/src
+            name: usr-src
+{{- end }}
         - name: contrail-vrouter-init-dpdk
           image: {{ $context.Values.global.images.tags.vrouter_init_dpdk | quote }}
           imagePullPolicy: {{ default "" $context.Values.global.images.imagePullPolicy | quote }}

diff --git a/contrail-vrouter/values.yaml b/contrail-vrouter/values.yaml
@@ -7,6 +7,7 @@ global:
       build_driver_init: "docker.io/opencontrailnightly/contrail-vrouter-kernel-build-init:latest"
       vrouter_agent: "docker.io/opencontrailnightly/contrail-vrouter-agent:latest"
       vrouter_init_kernel: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init:latest"
+      vrouter_plugin_mellanox_init: "docker.io/opencontrailnightly/contrail-vrouter-plugin-mellanox-init-ubuntu:latest"
       vrouter_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-agent-dpdk:latest"
       vrouter_init_dpdk: "docker.io/opencontrailnightly/contrail-vrouter-kernel-init-dpdk:latest"
       dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1