From 446a4bbdc82b249c8a8347a6c6ba58d0e1f216e2 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Fri, 17 Mar 2017 18:17:47 +0300 Subject: [PATCH] Fix weave on RHEL deployment Reduce retry delay checking weave Always load br_netfilter module --- roles/kubernetes-apps/network_plugin/weave/tasks/main.yml | 2 +- roles/network_plugin/weave/tasks/main.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/roles/kubernetes-apps/network_plugin/weave/tasks/main.yml b/roles/kubernetes-apps/network_plugin/weave/tasks/main.yml index 93be1602b..232f2d781 100644 --- a/roles/kubernetes-apps/network_plugin/weave/tasks/main.yml +++ b/roles/kubernetes-apps/network_plugin/weave/tasks/main.yml @@ -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] diff --git a/roles/network_plugin/weave/tasks/main.yml b/roles/network_plugin/weave/tasks/main.yml index a956b9481..ed6ad62d5 100644 --- a/roles/network_plugin/weave/tasks/main.yml +++ b/roles/network_plugin/weave/tasks/main.yml @@ -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