Merge pull request #1152 from mattymo/redhat_weave

Fix weave on RHEL deployment
This commit is contained in:
Matthew Mosesohn 2017-03-19 16:45:20 +03:00 committed by GitHub
commit 939c1def5d
2 changed files with 6 additions and 1 deletions

View file

@ -28,7 +28,7 @@
return_content: yes
register: weave_status
retries: 180
delay: 10
delay: 5
until: "{{ weave_status.status == 200 and
'Status: ready' in weave_status.content }}"
when: inventory_hostname == groups['kube-master'][0]

View file

@ -1,6 +1,11 @@
---
- include: pre-upgrade.yml
- name: Weave | enable br_netfilter module
modprobe:
name: br_netfilter
state: present
- 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/"
register: cni_task_result