Browse Source

remove duplicate task

pull/15/head
Smaine Kahlouch 9 years ago
parent
commit
3f8f0f550b
1 changed files with 2 additions and 11 deletions
  1. 13
      roles/docker/tasks/configure.yml

13
roles/docker/tasks/configure.yml

@ -7,15 +7,6 @@
command: /etc/network/if-up.d/create_cbr command: /etc/network/if-up.d/create_cbr
when: kube_network_plugin is defined and kube_network_plugin == "calico" 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 - name: enable docker
service: service:
name: docker name: docker
@ -24,10 +15,10 @@
tags: tags:
- docker - docker
- meta: flush_handlers
#- name: login to arkena's docker registry #- name: login to arkena's docker registry
# shell : > # shell : >
# docker login --username={{ dockerhub_user }} # docker login --username={{ dockerhub_user }}
# --password={{ dockerhub_pass }} # --password={{ dockerhub_pass }}
# --email={{ dockerhub_email }} # --email={{ dockerhub_email }}
- meta: flush_handlers
Loading…
Cancel
Save