fix flannel deployment, remove docker bridge before restarting

This commit is contained in:
Smana
2016-05-13 15:08:28 +02:00
parent 242e96d251
commit ae5ff890d4
5 changed files with 23 additions and 28 deletions

View File

@@ -1,5 +1,5 @@
---
- name: tokens | copy tokens generation script
- name: Gen_tokens | copy tokens generation script
copy:
src: "kube-gen-token.sh"
dest: "{{ kube_script_dir }}/kube-gen-token.sh"
@@ -8,7 +8,7 @@
delegate_to: "{{groups['kube-master'][0]}}"
when: gen_tokens|default(false)
- name: tokens | generate tokens for master components
- name: Gen_tokens | generate tokens for master components
command: "{{ kube_script_dir }}/kube-gen-token.sh {{ item[0] }}-{{ item[1] }}"
environment:
TOKEN_DIR: "{{ kube_token_dir }}"
@@ -22,7 +22,7 @@
delegate_to: "{{groups['kube-master'][0]}}"
when: gen_tokens|default(false)
- name: tokens | generate tokens for node components
- name: Gen_tokens | generate tokens for node components
command: "{{ kube_script_dir }}/kube-gen-token.sh {{ item[0] }}-{{ item[1] }}"
environment:
TOKEN_DIR: "{{ kube_token_dir }}"
@@ -36,14 +36,14 @@
delegate_to: "{{groups['kube-master'][0]}}"
when: gen_tokens|default(false)
- name: tokens | Get list of tokens from first master
- name: Gen_tokens | Get list of tokens from first master
shell: "(find {{ kube_token_dir }} -maxdepth 1 -type f)"
register: tokens_list
changed_when: false
delegate_to: "{{groups['kube-master'][0]}}"
when: sync_tokens|default(false)
- name: tokens | Get the tokens from first master
- name: Gen_tokens | Get the tokens from first master
slurp:
src: "{{ item }}"
register: slurp_tokens
@@ -53,7 +53,7 @@
when: sync_tokens|default(false)
notify: set secret_changed
- name: tokens | Copy tokens on masters
- name: Gen_tokens | Copy tokens on masters
copy:
content: "{{ item.content|b64decode }}"
dest: "{{ item.source }}"