kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2460 from riverzhang/fix-weave 

Fix yamllint roles error for #2188 commit
pull/2453/merge
Aivars Sterns 2018-03-13 09:40:54 +02:00 committed by GitHub
parent 69a3c33ceb d264da8f08
commit 7904b454ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles/network_plugin/weave/tasks/main.yml
View File

@ -2,12 +2,11 @@
- import_tasks: seed.yml - import_tasks: seed.yml
when: weave_mode_seed when: weave_mode_seed
- name: template weavenet conflist - name: template weavenet conflist
template: template:
src: weavenet.conflist.j2 src: weavenet.conflist.j2
dest: /etc/cni/net.d/00-weave.conflist dest: /etc/cni/net.d/00-weave.conflist
owner: kube owner: kube
- name: Weave | Copy cni plugins from hyperkube - name: Weave | Copy cni plugins from hyperkube
command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /bin/cp -r /opt/cni/bin/. /cnibindir/" command: "{{ docker_bin_dir }}/docker run --rm -v /opt/cni/bin:/cnibindir {{ hyperkube_image_repo }}:{{ hyperkube_image_tag }} /bin/cp -r /opt/cni/bin/. /cnibindir/"