From 9f1e3db90621979e2630ac293e18ac1fb597e736 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Thu, 22 Dec 2016 23:05:17 +0400 Subject: [PATCH 1/2] Adjust etcd server certificates ETCD doesn't need cert/key options set. It only requires peer cert options. --- roles/etcd/templates/etcd.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/roles/etcd/templates/etcd.j2 b/roles/etcd/templates/etcd.j2 index cce0aa2e9..5f786661c 100644 --- a/roles/etcd/templates/etcd.j2 +++ b/roles/etcd/templates/etcd.j2 @@ -13,8 +13,6 @@ ETCD_INITIAL_CLUSTER={{ etcd_peer_addresses }} # TLS settings ETCD_TRUSTED_CA_FILE={{ etcd_cert_dir }}/ca.pem -ETCD_CERT_FILE={{ etcd_cert_dir }}/node-{{ inventory_hostname }}.pem -ETCD_KEY_FILE={{ etcd_cert_dir }}/node-{{ inventory_hostname }}-key.pem 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 From 385f7f6e754a491f3e42e6b031a3250376d3370d Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Thu, 22 Dec 2016 22:29:24 +0300 Subject: [PATCH 2/2] Update etcd.j2 --- roles/etcd/templates/etcd.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/etcd/templates/etcd.j2 b/roles/etcd/templates/etcd.j2 index 5f786661c..efa5a51bd 100644 --- a/roles/etcd/templates/etcd.j2 +++ b/roles/etcd/templates/etcd.j2 @@ -13,6 +13,8 @@ ETCD_INITIAL_CLUSTER={{ etcd_peer_addresses }} # TLS settings ETCD_TRUSTED_CA_FILE={{ etcd_cert_dir }}/ca.pem +ETCD_CERT_FILE={{ etcd_cert_dir }}/member-{{ inventory_hostname }}.pem +ETCD_KEY_FILE={{ etcd_cert_dir }}/member-{{ inventory_hostname }}-key.pem 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