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

Fixing cert name in calico/canal for etcd check (#2358)

Browse source
This commit is contained in:
Brad Beam 2018-02-22 08:37:07 -06:00 committed by Matthew Mosesohn
parent c874f16c02
commit 31659efe13
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roles/network_plugin/calico/tasks/main.yml
View file

@ -83,8 +83,8 @@
uri: uri:
url: https://localhost:2379/health url: https://localhost:2379/health
validate_certs: no validate_certs: no
client_cert: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem" client_cert: "{{ etcd_cert_dir }}/node-{{ groups['etcd'][0] }}.pem"
client_key: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem" client_key: "{{ etcd_cert_dir }}/node-{{ groups['etcd'][0] }}-key.pem"
register: result register: result
until: result.status == 200 or result.status == 401 until: result.status == 200 or result.status == 401
retries: 10 retries: 10

4
roles/network_plugin/canal/tasks/main.yml
View file

@ -35,8 +35,8 @@
changed_when: false changed_when: false
run_once: true run_once: true
environment: environment:
ETCDCTL_CERT_FILE: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem" ETCDCTL_CERT_FILE: "{{ etcd_cert_dir }}/node-{{ groups['etcd'][0] }}.pem"
ETCDCTL_KEY_FILE: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem" ETCDCTL_KEY_FILE: "{{ etcd_cert_dir }}/node-{{ groups['etcd'][0] }}-key.pem"
- name: Canal | Create canal node manifests - name: Canal | Create canal node manifests
template: template: