epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-28 01:29:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Security fixes for etcd (#1778)" (#1786)

Browse Source 
This reverts commit 4209f1cbfd.
This commit is contained in:
Matthew Mosesohn
2017-10-12 14:02:51 +01:00
committed by GitHub
parent 4209f1cbfd
commit 10dd049912
4 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/etcd/templates/etcd.env.j2
View File

@@ -1,5 +1,4 @@
ETCD_DATA_DIR={{ etcd_data_dir }}
ETCD_WAL_DIR={{ etcd_data_dir }}/member/wal
ETCD_ADVERTISE_CLIENT_URLS={{ etcd_client_url }}
ETCD_INITIAL_ADVERTISE_PEER_URLS={{ etcd_peer_url }}
ETCD_INITIAL_CLUSTER_STATE={% if etcd_cluster_is_healthy.rc != 0 | bool %}new{% else %}existing{% endif %}
@@ -23,5 +22,3 @@ ETCD_PEER_TRUSTED_CA_FILE={{ etcd_cert_dir }}/ca.pem
ETCD_PEER_CERT_FILE={{ etcd_cert_dir }}/member-{{ inventory_hostname }}.pem
ETCD_PEER_KEY_FILE={{ etcd_cert_dir }}/member-{{ inventory_hostname }}-key.pem
ETCD_PEER_CLIENT_CERT_AUTH=true
ETCD_CLIENT_CERT_AUTH=true