From a98b866a66fccfa017cc83301358d5f5e88636eb Mon Sep 17 00:00:00 2001
From: Yuki KIRII <shiftky@users.noreply.github.com>
Date: Thu, 24 Aug 2017 23:47:32 +0900
Subject: [PATCH] Verify if br_netfilter module exists (#1492)
---
roles/network_plugin/weave/tasks/main.yml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/roles/network_plugin/weave/tasks/main.yml b/roles/network_plugin/weave/tasks/main.yml
index 813bbfafe..bd6691859 100644
--- a/roles/network_plugin/weave/tasks/main.yml
+++ b/roles/network_plugin/weave/tasks/main.yml
@@ -4,10 +4,17 @@
- include: seed.yml
when: weave_mode_seed
-- name: Weave | enable br_netfilter module
+- name: Weave | Verify if br_netfilter module exists
+ shell: "modinfo br_netfilter"
+ register: modinfo_br_netfilter
+ failed_when: modinfo_br_netfilter.rc not in [0, 1]
+ changed_when: false
+
+- name: Weave | Enable br_netfilter module
modprobe:
name: br_netfilter
state: present
+ when: modinfo_br_netfilter.rc == 0
- 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/"
--
GitLab