C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #236 from kubespray/fix_gen_certs_234

Browse source 
fixes the certs issue when masters or not in the kube-node group
This commit is contained in:
Smaine Kahlouch 2016-05-12 10:23:10 +02:00
commit c6e3a8dbbd
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
roles/kubernetes/secrets/tasks/gen_certs.yml
View file

@ -4,7 +4,8 @@
src: "openssl.conf.j2" src: "openssl.conf.j2"
dest: "{{ kube_config_dir }}/openssl.conf" dest: "{{ kube_config_dir }}/openssl.conf"
run_once: yes run_once: yes
when: inventory_hostname == groups['kube-master'][0] and gen_certs|default(false) delegate_to: "{{groups['kube-master'][0]}}"
when: gen_certs|default(false)
- name: certs | copy certs generation script - name: certs | copy certs generation script
copy: copy:
@ -12,12 +13,14 @@
dest: "{{ kube_script_dir }}/make-ssl.sh" dest: "{{ kube_script_dir }}/make-ssl.sh"
mode: 0700 mode: 0700
run_once: yes run_once: yes
when: inventory_hostname == groups['kube-master'][0] and gen_certs|default(false) delegate_to: "{{groups['kube-master'][0]}}"
when: gen_certs|default(false)
- name: certs | run cert generation script - name: certs | run cert generation script
command: "{{ kube_script_dir }}/make-ssl.sh -f {{ kube_config_dir }}/openssl.conf -d {{ kube_cert_dir }}" command: "{{ kube_script_dir }}/make-ssl.sh -f {{ kube_config_dir }}/openssl.conf -d {{ kube_cert_dir }}"
run_once: yes run_once: yes
when: inventory_hostname == groups['kube-master'][0] and gen_certs|default(false) delegate_to: "{{groups['kube-master'][0]}}"
when: gen_certs|default(false)
notify: set secret_changed notify: set secret_changed
- set_fact: - set_fact:

16
roles/kubernetes/secrets/tasks/gen_tokens.yml
View file

@ -5,7 +5,8 @@
dest: "{{ kube_script_dir }}/kube-gen-token.sh" dest: "{{ kube_script_dir }}/kube-gen-token.sh"
mode: 0700 mode: 0700
run_once: yes run_once: yes
when: inventory_hostname == groups['kube-master'][0] and gen_tokens|default(false) delegate_to: "{{groups['kube-master'][0]}}"
when: gen_tokens|default(false)
- name: tokens | generate tokens for master components - name: tokens | generate tokens for master components
command: "{{ kube_script_dir }}/kube-gen-token.sh {{ item[0] }}-{{ item[1] }}" command: "{{ kube_script_dir }}/kube-gen-token.sh {{ item[0] }}-{{ item[1] }}"
@ -18,7 +19,8 @@
changed_when: "'Added' in gentoken_master.stdout" changed_when: "'Added' in gentoken_master.stdout"
notify: set secret_changed notify: set secret_changed
run_once: yes run_once: yes
when: inventory_hostname == groups['kube-master'][0] and gen_tokens|default(false) delegate_to: "{{groups['kube-master'][0]}}"
when: gen_tokens|default(false)
- name: tokens | generate tokens for node components - name: tokens | generate tokens for node components
command: "{{ kube_script_dir }}/kube-gen-token.sh {{ item[0] }}-{{ item[1] }}" command: "{{ kube_script_dir }}/kube-gen-token.sh {{ item[0] }}-{{ item[1] }}"
@ -31,22 +33,24 @@
changed_when: "'Added' in gentoken_node.stdout" changed_when: "'Added' in gentoken_node.stdout"
notify: set secret_changed notify: set secret_changed
run_once: yes run_once: yes
when: inventory_hostname == groups['kube-master'][0] and gen_tokens|default(false) delegate_to: "{{groups['kube-master'][0]}}"
when: gen_tokens|default(false)
- name: tokens | Get list of tokens from first master - name: tokens | Get list of tokens from first master
shell: "(find {{ kube_token_dir }} -maxdepth 1 -type f)" shell: "(find {{ kube_token_dir }} -maxdepth 1 -type f)"
register: tokens_list register: tokens_list
changed_when: false changed_when: false
when: inventory_hostname == groups['kube-master'][0] and sync_tokens|default(false) delegate_to: "{{groups['kube-master'][0]}}"
when: sync_tokens|default(false)
- name: tokens | Get the tokens from first master - name: tokens | Get the tokens from first master
slurp: slurp:
src: "{{ item }}" src: "{{ item }}"
delegate_to: "{{groups['kube-master'][0]}}"
register: slurp_tokens register: slurp_tokens
with_items: '{{tokens_list.stdout_lines}}' with_items: '{{tokens_list.stdout_lines}}'
when: sync_tokens|default(false)
run_once: true run_once: true
delegate_to: "{{groups['kube-master'][0]}}"
when: sync_tokens|default(false)
notify: set secret_changed notify: set secret_changed
- name: tokens | Copy tokens on masters - name: tokens | Copy tokens on masters