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: certs | write openssl config
- name: Gen_certs | write openssl config
template:
src: "openssl.conf.j2"
dest: "{{ kube_config_dir }}/openssl.conf"
@@ -7,7 +7,7 @@
delegate_to: "{{groups['kube-master'][0]}}"
when: gen_certs|default(false)
- name: certs | copy certs generation script
- name: Gen_certs | copy certs generation script
copy:
src: "make-ssl.sh"
dest: "{{ kube_script_dir }}/make-ssl.sh"
@@ -16,7 +16,7 @@
delegate_to: "{{groups['kube-master'][0]}}"
when: gen_certs|default(false)
- name: certs | run cert generation script
- name: Gen_certs | run cert generation script
command: "{{ kube_script_dir }}/make-ssl.sh -f {{ kube_config_dir }}/openssl.conf -d {{ kube_cert_dir }}"
run_once: yes
delegate_to: "{{groups['kube-master'][0]}}"
@@ -27,7 +27,7 @@
master_certs: ['ca-key.pem', 'admin.pem', 'admin-key.pem', 'apiserver-key.pem', 'apiserver.pem']
node_certs: ['ca.pem', 'node.pem', 'node-key.pem']
- name: certs | Get the certs from first master
- name: Gen_certs | Get the certs from first master
slurp:
src: "{{ kube_cert_dir }}/{{ item }}"
delegate_to: "{{groups['kube-master'][0]}}"
@@ -37,7 +37,7 @@
run_once: true
notify: set secret_changed
- name: certs | Copy certs on masters
- name: Gen_certs | Copy certs on masters
copy:
content: "{{ item.content|b64decode }}"
dest: "{{ item.source }}"
@@ -45,7 +45,7 @@
when: inventory_hostname in groups['kube-master'] and sync_certs|default(false) and
inventory_hostname != groups['kube-master'][0]
- name: certs | Copy certs on nodes
- name: Gen_certs | Copy certs on nodes
copy:
content: "{{ item.content|b64decode }}"
dest: "{{ item.source }}"
@@ -54,19 +54,14 @@
inventory_hostname in groups['kube-node'] and sync_certs|default(false) and
inventory_hostname != groups['kube-master'][0]
- name: certs | check certificate permissions
- name: Gen_certs | check certificate permissions
file:
path={{ kube_cert_dir }}
group={{ kube_cert_group }}
owner=kube
recurse=yes
- shell: ls {{ kube_cert_dir}}/*key.pem
register: keyfiles
- name: Gen_certs | set permissions on keys
shell: chmod 0600 {{ kube_cert_dir}}/*key.pem
when: inventory_hostname in groups['kube-master']
changed_when: false
- name: certs | set permissions on keys
file:
path: "{{ item }}"
mode: 0600
with_items: "{{ keyfiles.stdout_lines }}"