From 3f8f0f550b727cda7647b6ee78a3da88de2b7bd6 Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Mon, 16 Nov 2015 22:16:36 +0100
Subject: [PATCH] remove duplicate task
---
roles/docker/tasks/configure.yml | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/roles/docker/tasks/configure.yml b/roles/docker/tasks/configure.yml
index 07506dec1..75df4d4de 100644
--- a/roles/docker/tasks/configure.yml
+++ b/roles/docker/tasks/configure.yml
@@ -7,15 +7,6 @@
command: /etc/network/if-up.d/create_cbr
when: kube_network_plugin is defined and kube_network_plugin == "calico"
-- name: Configure docker to use cbr0 bridge
- lineinfile:
- dest=/etc/default/docker
- regexp='.*DOCKER_OPTS=.*'
- line='DOCKER_OPTS="--bridge=cbr0 --iptables=false --ip-masq=false"'
- notify:
- - restart docker
- when: kube_network_plugin is defined and kube_network_plugin == "calico"
-
- name: enable docker
service:
name: docker
@@ -24,10 +15,10 @@
tags:
- docker
-- meta: flush_handlers
-
#- name: login to arkena's docker registry
# shell : >
# docker login --username={{ dockerhub_user }}
# --password={{ dockerhub_pass }}
# --email={{ dockerhub_email }}
+
+- meta: flush_handlers
--
GitLab