From d3f35e12a23a8c40074634b108f5284f3524e547 Mon Sep 17 00:00:00 2001 From: Smaine Kahlouch Date: Sun, 22 Nov 2015 13:33:13 +0100 Subject: [PATCH] Simplify docker role, cbr0 for calico isn't required anymore --- roles/docker/tasks/configure.yml | 8 -------- roles/docker/templates/create_cbr.j2 | 14 -------------- roles/docker/templates/default-docker.j2 | 4 +--- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 roles/docker/templates/create_cbr.j2 diff --git a/roles/docker/tasks/configure.yml b/roles/docker/tasks/configure.yml index d370f4b84..1e337ce5d 100644 --- a/roles/docker/tasks/configure.yml +++ b/roles/docker/tasks/configure.yml @@ -1,12 +1,4 @@ --- -- name: Write script for calico/docker bridge configuration - template: src=create_cbr.j2 dest=/etc/network/if-up.d/create_cbr mode=u+x backup=yes - when: kube_network_plugin is defined and kube_network_plugin == "calico" - -- name: Configure calico/docker bridge - command: /etc/network/if-up.d/create_cbr - when: kube_network_plugin is defined and kube_network_plugin == "calico" - - name: enable docker service: name: docker diff --git a/roles/docker/templates/create_cbr.j2 b/roles/docker/templates/create_cbr.j2 deleted file mode 100644 index 24bf172e6..000000000 --- a/roles/docker/templates/create_cbr.j2 +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# Create calico bridge cbr0 if it doesn't exist -ifaces=$(ifconfig -a | sed 's/[ \t].*//;/^\(lo\|\)$/d' |tr '\n' ' ') -if ! [[ "${ifaces}" =~ "cbr0" ]];then - brctl addbr cbr0 - ip link set cbr0 up -fi - -# Configure calico bridge ip -br_ips=$(ip addr list cbr0 |grep "inet " |cut -d' ' -f6) -if ! [[ "${br_ips}" =~ "{{ br_addr }}/{{ kube_network_node_prefix }}" ]];then - ip a add {{ br_addr }}/{{ kube_network_node_prefix }} dev cbr0 -fi diff --git a/roles/docker/templates/default-docker.j2 b/roles/docker/templates/default-docker.j2 index 66e3cd2ee..3da7d3606 100644 --- a/roles/docker/templates/default-docker.j2 +++ b/roles/docker/templates/default-docker.j2 @@ -4,9 +4,7 @@ #DOCKER="/usr/local/bin/docker" # Use DOCKER_OPTS to modify the daemon startup options. -{% if kube_network_plugin is defined and kube_network_plugin == "calico" %} -DOCKER_OPTS="--bridge=cbr0 --iptables=false --ip-masq=false" -{% endif %} +#DOCKER_OPTS="" # If you need Docker to use an HTTP proxy, it can also be specified here. #export http_proxy="http://127.0.0.1:3128/"