zhengtianbao
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
4 additions and
4 deletions
-
roles/etcd/handlers/main.yml
-
roles/etcd/templates/etcd-events.env.j2
-
roles/kubespray-defaults/defaults/main.yaml
|
|
|
@ -45,7 +45,7 @@ |
|
|
|
|
|
|
|
- name: wait for etcd-events up |
|
|
|
uri: |
|
|
|
url: "https://{% if is_etcd_master %}{{ etcd_address }}{% else %}127.0.0.1{% endif %}:2381/health" |
|
|
|
url: "https://{% if is_etcd_master %}{{ etcd_address }}{% else %}127.0.0.1{% endif %}:2383/health" |
|
|
|
validate_certs: no |
|
|
|
client_cert: "{{ etcd_cert_dir }}/member-{{ inventory_hostname }}.pem" |
|
|
|
client_key: "{{ etcd_cert_dir }}/member-{{ inventory_hostname }}-key.pem" |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ ETCD_INITIAL_ADVERTISE_PEER_URLS={{ etcd_events_peer_url }} |
|
|
|
ETCD_INITIAL_CLUSTER_STATE={% if etcd_events_cluster_is_healthy.rc == 0 | bool %}existing{% else %}new{% endif %} |
|
|
|
|
|
|
|
ETCD_METRICS={{ etcd_metrics }} |
|
|
|
ETCD_LISTEN_CLIENT_URLS=https://{{ etcd_address }}:2381,https://127.0.0.1:2381 |
|
|
|
ETCD_LISTEN_CLIENT_URLS=https://{{ etcd_address }}:2383,https://127.0.0.1:2383 |
|
|
|
ETCD_ELECTION_TIMEOUT={{ etcd_election_timeout }} |
|
|
|
ETCD_HEARTBEAT_INTERVAL={{ etcd_heartbeat_interval }} |
|
|
|
ETCD_INITIAL_CLUSTER_TOKEN=k8s_events_etcd |
|
|
|
|
|
|
|
@ -533,7 +533,7 @@ etcd_events_access_address: "{{ access_ip | default(etcd_address) }}" |
|
|
|
etcd_peer_url: "https://{{ etcd_access_address }}:2380" |
|
|
|
etcd_client_url: "https://{{ etcd_access_address }}:2379" |
|
|
|
etcd_events_peer_url: "https://{{ etcd_events_access_address }}:2382" |
|
|
|
etcd_events_client_url: "https://{{ etcd_events_access_address }}:2381" |
|
|
|
etcd_events_client_url: "https://{{ etcd_events_access_address }}:2383" |
|
|
|
etcd_access_addresses: |- |
|
|
|
{% for item in etcd_hosts -%} |
|
|
|
https://{{ hostvars[item]['etcd_access_address'] | default(hostvars[item]['ip'] | default(fallback_ips[item])) }}:2379{% if not loop.last %},{% endif %} |
|
|
|
@ -541,7 +541,7 @@ etcd_access_addresses: |- |
|
|
|
etcd_events_access_addresses_list: |- |
|
|
|
[ |
|
|
|
{% for item in etcd_hosts -%} |
|
|
|
'https://{{ hostvars[item]['etcd_events_access_address'] | default(hostvars[item]['ip'] | default(fallback_ips[item])) }}:2381'{% if not loop.last %},{% endif %} |
|
|
|
'https://{{ hostvars[item]['etcd_events_access_address'] | default(hostvars[item]['ip'] | default(fallback_ips[item])) }}:2383'{% if not loop.last %},{% endif %} |
|
|
|
{%- endfor %} |
|
|
|
] |
|
|
|
etcd_metrics_addresses: |- |
|
|
|
|
