From 4a7d8c6fea86a2eec9fe805676c7c8607be356a6 Mon Sep 17 00:00:00 2001 From: Smana Date: Thu, 2 Jun 2016 21:01:41 +0200 Subject: [PATCH] clean conditions into docker templates --- roles/network_plugin/calico/templates/docker | 8 +------- roles/network_plugin/flannel/templates/docker | 5 ++--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/roles/network_plugin/calico/templates/docker b/roles/network_plugin/calico/templates/docker index 28518499e..970ea051d 100644 --- a/roles/network_plugin/calico/templates/docker +++ b/roles/network_plugin/calico/templates/docker @@ -1,8 +1,2 @@ # Deployed by Ansible -{% if ansible_service_mgr in ["sysvinit","upstart"] and kube_network_plugin == "flannel" and ansible_os_family == "Debian" %} -DOCKER_OPTS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}" -{% elif kube_network_plugin == "flannel" and ansible_os_family == "RedHat" %} -DOCKER_NETWORK_OPTIONS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}" -{% elif kube_network_plugin == "flannel" %} -OPTIONS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}" -{% endif %} +DOCKER_OPTS="" diff --git a/roles/network_plugin/flannel/templates/docker b/roles/network_plugin/flannel/templates/docker index 7946d2b3d..a0e2b052b 100644 --- a/roles/network_plugin/flannel/templates/docker +++ b/roles/network_plugin/flannel/templates/docker @@ -1,7 +1,6 @@ # Deployed by Ansible -{% if (ansible_service_mgr in ["sysvinit","upstart"] and kube_network_plugin == "flannel" and ansible_os_family == "Debian") or - (kube_network_plugin == "flannel" and ansible_os_family == "CoreOS") %} +{% if (ansible_service_mgr in ["sysvinit","upstart"] and ansible_os_family == "Debian") or (ansible_os_family == "CoreOS") %} DOCKER_OPTS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}" -{% elif kube_network_plugin == "flannel" %} +{% else %} OPTIONS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}" {% endif %}