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

Merge pull request #596 from kubernetes-incubator/fix_etcd_coreos_ca

Browse source 
Fix ca certificate loading on CoreOS
This commit is contained in:
Smaine Kahlouch 2016-11-14 07:28:17 +01:00 committed by GitHub
commit f6233ffc9a
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
roles/etcd/tasks/gen_certs.yml
View file

@ -84,21 +84,21 @@
when: inventory_hostname in groups['etcd'] when: inventory_hostname in groups['etcd']
changed_when: false changed_when: false
- name: Gen_certs | target ca-certificates directory - name: Gen_certs | target ca-certificate store file
set_fact: set_fact:
ca_cert_dir: |- ca_cert_path: |-
{% if ansible_os_family == "Debian" -%} {% if ansible_os_family == "Debian" -%}
/usr/local/share/ca-certificates /usr/local/share/ca-certificates/etcd-ca.crt
{%- elif ansible_os_family == "RedHat" -%} {%- elif ansible_os_family == "RedHat" -%}
/etc/pki/ca-trust/source/anchors /etc/pki/ca-trust/source/anchors/etcd-ca.crt
{%- elif ansible_os_family == "CoreOS" -%} {%- elif ansible_os_family == "CoreOS" -%}
/etc/ssl/certs /etc/ssl/certs/etcd-ca.pem
{%- endif %} {%- endif %}
- name: Gen_certs | add CA to trusted CA dir - name: Gen_certs | add CA to trusted CA dir
copy: copy:
src: "{{ etcd_cert_dir }}/ca.pem" src: "{{ etcd_cert_dir }}/ca.pem"
dest: "{{ ca_cert_dir }}/etcd-ca.crt" dest: "{{ ca_cert_path }}"
remote_src: true remote_src: true
register: etcd_ca_cert register: etcd_ca_cert
@ -106,6 +106,7 @@
command: update-ca-certificates command: update-ca-certificates
when: etcd_ca_cert.changed and ansible_os_family in ["Debian", "CoreOS"] when: etcd_ca_cert.changed and ansible_os_family in ["Debian", "CoreOS"]
- name: Gen_certs | update ca-certificatesa (RedHat) - name: Gen_certs | update ca-certificates (RedHat)
command: update-ca-trust extract command: update-ca-trust extract
when: etcd_ca_cert.changed and ansible_os_family == "RedHat" when: etcd_ca_cert.changed and ansible_os_family == "RedHat"

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

@ -65,21 +65,21 @@
when: inventory_hostname in groups['kube-master'] when: inventory_hostname in groups['kube-master']
changed_when: false changed_when: false
- name: Gen_certs | target ca-certificates directory - name: Gen_certs | target ca-certificates path
set_fact: set_fact:
ca_cert_dir: |- ca_cert_path: |-
{% if ansible_os_family == "Debian" -%} {% if ansible_os_family == "Debian" -%}
/usr/local/share/ca-certificates /usr/local/share/ca-certificates/kube-ca.crt
{%- elif ansible_os_family == "RedHat" -%} {%- elif ansible_os_family == "RedHat" -%}
/etc/pki/ca-trust/source/anchors /etc/pki/ca-trust/source/anchors/kube-ca.crt
{%- elif ansible_os_family == "CoreOS" -%} {%- elif ansible_os_family == "CoreOS" -%}
/etc/ssl/certs /etc/ssl/certs/kube-ca.pem
{%- endif %} {%- endif %}
- name: Gen_certs | add CA to trusted CA dir - name: Gen_certs | add CA to trusted CA dir
copy: copy:
src: "{{ kube_cert_dir }}/ca.pem" src: "{{ kube_cert_dir }}/ca.pem"
dest: "{{ ca_cert_dir }}/kube-ca.crt" dest: "{{ ca_cert_path }}"
remote_src: true remote_src: true
register: kube_ca_cert register: kube_ca_cert
@ -87,7 +87,7 @@
command: update-ca-certificates command: update-ca-certificates
when: kube_ca_cert.changed and ansible_os_family in ["Debian", "CoreOS"] when: kube_ca_cert.changed and ansible_os_family in ["Debian", "CoreOS"]
- name: Gen_certs | update ca-certificatesa (RedHat) - name: Gen_certs | update ca-certificates (RedHat)
command: update-ca-trust extract command: update-ca-trust extract
when: kube_ca_cert.changed and ansible_os_family == "RedHat" when: kube_ca_cert.changed and ansible_os_family == "RedHat"