External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-01 01:28:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix calico-rr to use etcd certs instead of kube certs

Browse Source
This commit is contained in:
Matthew Mosesohn
2016-12-23 19:25:37 +03:00
parent 36a5143478
commit 6d9cd2d720
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/network_plugin/calico/rr/meta/main.yml
View File

@@ -1,5 +1,5 @@
dependencies:
- role: kubernetes/secrets
- role: etcd
- role: docker
when: ansible_os_family != "CoreOS"
- role: download

10
roles/network_plugin/calico/rr/tasks/main.yml
View File

@@ -7,7 +7,7 @@
set_fact:
rr_ip: "{{ calico_rr_ip | default(ip) | default(ansible_default_ipv4.address) }}"
- name: Calico | Create calico certs directory
- name: Calico-rr | Create calico certs directory
file:
dest: "{{ calico_cert_dir }}"
state: directory
@@ -15,16 +15,16 @@
owner: root
group: root
- name: Calico | Link etcd certificates for calico-node
- name: Calico-rr | Link etcd certificates for calico-node
file:
src: "{{ kube_cert_dir }}/{{ item.s }}"
src: "{{ etcd_cert_dir }}/{{ item.s }}"
dest: "{{ calico_cert_dir }}/{{ item.d }}"
state: hard
force: yes
with_items:
- {s: "ca.pem", d: "ca_cert.crt"}
- {s: "node.pem", d: "cert.crt"}
- {s: "node-key.pem", d: "key.pem"}
- {s: "node-{{ inventory_hostname }}.pem", d: "cert.crt"}
- {s: "node-{{ inventory_hostname }}-key.pem", d: "key.pem"}
- name: Calico-rr | Create dir for logs
file: