Skip to content
Snippets Groups Projects
Unverified Commit 9837b792 authored by Matthew Mosesohn's avatar Matthew Mosesohn Committed by GitHub
Browse files

Use proper lookup of etcd host for calico (#2408)

Fixes #2397
parent 5aeaa248
No related branches found
No related tags found
No related merge requests found
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
- name: Calico | wait for etcd - name: Calico | wait for etcd
uri: uri:
url: https://localhost:2379/health url: "{{ etcd_access_addresses.split(',') | first }}/health"
validate_certs: no validate_certs: no
client_cert: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem" client_cert: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem"
client_key: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem" client_key: "{{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem"
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
--cacert {{ etcd_cert_dir }}/ca.pem \ --cacert {{ etcd_cert_dir }}/ca.pem \
--cert {{ etcd_cert_dir}}/node-{{ inventory_hostname }}.pem \ --cert {{ etcd_cert_dir}}/node-{{ inventory_hostname }}.pem \
--key {{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem \ --key {{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem \
https://localhost:2379/v2/keys/calico/v1/ipam/v4/pool {{ etcd_access_addresses.split(',') | first }}/v2/keys/calico/v1/ipam/v4/pool
register: calico_conf register: calico_conf
retries: 4 retries: 4
delay: "{{ retry_stagger | random + 3 }}" delay: "{{ retry_stagger | random + 3 }}"
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
--cacert {{ etcd_cert_dir }}/ca.pem \ --cacert {{ etcd_cert_dir }}/ca.pem \
--cert {{ etcd_cert_dir}}/node-{{ inventory_hostname }}.pem \ --cert {{ etcd_cert_dir}}/node-{{ inventory_hostname }}.pem \
--key {{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem \ --key {{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem \
https://localhost:2379/v2/keys/calico/v1/ipam/v4/pool {{ etcd_access_addresses.split(',') | first }}/v2/keys/calico/v1/ipam/v4/pool
register: calico_pools_raw register: calico_pools_raw
retries: 4 retries: 4
delay: "{{ retry_stagger | random + 3 }}" delay: "{{ retry_stagger | random + 3 }}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment