diff options
| author |   Xuan Jia <jason.jiaxuan@gmail.com> | 2017-08-16 06:07:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-16 06:07:14 +0000 |
| commit | 08db604ab4a7c865547d86549589cdb20cd25228 (patch) | |
| tree | b44acf32bc4aee60a1f379b624f1e7d1d962e39b /src/cni | |
| parent | dbf294252cc8b418d920dcd94749630d741c8bb9 (diff) | |
| parent | da51aabb3171afb8107f837fd0ccfe1add403c4d (diff) | |
Merge "Fix some issues in ovsdpdk, cni for ovsdpdk"
Diffstat (limited to 'src/cni')
| -rw-r--r-- | src/cni/ovsdpdk/install_cni.sh | 2 | ||||
| -rw-r--r-- | src/cni/ovsdpdk/kube_cniovsdpdk.yml (renamed from src/cni/ovsdpdk/kube_ovsdpdk.yml) | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/cni/ovsdpdk/install_cni.sh b/src/cni/ovsdpdk/install_cni.sh index 8f5b78a..1996700 100644 --- a/src/cni/ovsdpdk/install_cni.sh +++ b/src/cni/ovsdpdk/install_cni.sh @@ -4,5 +4,5 @@ set -ex cp /cni/ovsdpdk /opt/cni/bin cp /cni/setup_ovsdpdk.sh /opt/cni/bin cp /cni/teardown_ovsdpdk.sh /opt/cni/bin -cp /etc/kube-ovsdpdk/cni-conf.json /etc/cni/net.d/10-ovsdpdk.conf +cp /etc/kube-cniovsdpdk/cni-conf.json /etc/cni/net.d/10-ovsdpdk.conf while true; do sleep 3600; done diff --git a/src/cni/ovsdpdk/kube_ovsdpdk.yml b/src/cni/ovsdpdk/kube_cniovsdpdk.yml index 2bcebdc..8e8ed0e 100644 --- a/src/cni/ovsdpdk/kube_ovsdpdk.yml +++ b/src/cni/ovsdpdk/kube_cniovsdpdk.yml @@ -2,17 +2,17 @@ apiVersion: v1 kind: ServiceAccount metadata: - name: ovsdpdk + name: cniovsdpdk namespace: kube-system --- kind: ConfigMap apiVersion: v1 metadata: - name: kube-ovsdpdk-cfg + name: kube-cniovsdpdk-cfg namespace: kube-system labels: tier: node - app: ovsdpdk + app: cniovsdpdk data: cni-conf.json: | { @@ -28,17 +28,17 @@ data: apiVersion: extensions/v1beta1 kind: DaemonSet metadata: - name: kube-ovsdpdk-ds + name: kube-cniovsdpdk-ds namespace: kube-system labels: tier: node - app: ovsdpdk + app: cniovsdpdk spec: template: metadata: labels: tier: node - app: ovsdpdk + app: cniovsdpdk spec: hostNetwork: true nodeSelector: @@ -47,7 +47,7 @@ spec: - key: node-role.kubernetes.io/master operator: Exists effect: NoSchedule - serviceAccountName: ovsdpdk + serviceAccountName: cniovsdpdk containers: - name: install-cni image: openretriever/cni-ovsdpdk @@ -57,8 +57,8 @@ spec: mountPath: /opt/cni/bin - name: cni-cfg mountPath: /etc/cni/net.d - - name: ovsdpdk-cfg - mountPath: /etc/kube-ovsdpdk + - name: cniovsdpdk-cfg + mountPath: /etc/kube-cniovsdpdk volumes: - name: cni-bin hostPath: @@ -66,6 +66,6 @@ spec: - name: cni-cfg hostPath: path: /etc/cni/net.d - - name: ovsdpdk-cfg + - name: cniovsdpdk-cfg configMap: - name: kube-ovsdpdk-cfg + name: kube-cniovsdpdk-cfg |