Merge pull request #22 from dougbtv/fixbridge

[fixbridge][bugfix] wrong spot for changing /proc/sys/net/bridge/brid…
redhat-nfvpe · Jun 14, 2017 · c508360 · c508360
2 parents c3c129b + c94b6ee
commit c508360
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/roles/kube-init/tasks/main.yml b/roles/kube-init/tasks/main.yml
@@ -13,6 +13,10 @@
     arg_pod_network: "--pod-network-cidr {{ pod_network_cidr }}/16"
   when: pod_network_type != "weave"
 
+- name: Set bridge-nf-call-iptables to 1
+  shell: >
+    echo "1" > /proc/sys/net/bridge/bridge-nf-call-iptables
+
 # Was trying to use flannel and running with:
 #     kubeadm init > /etc/kubeadm.init.txt
 # abandonded for now...

diff --git a/roles/kube-install/tasks/main.yml b/roles/kube-install/tasks/main.yml
@@ -33,10 +33,6 @@
     - kubectl
     - kubernetes-cni
 
-- name: Set bridge-nf-call-iptables to 1
-  shell: >
-    echo "1" > /proc/sys/net/bridge/bridge-nf-call-iptables
-
 - name: Include kube 1.6.0 work-around
   include: kube-16-workaround.yml
   when: kube_16_workaround