From 9c48f666ec10eef09fd7c8c54580d0ccb0d0c06d Mon Sep 17 00:00:00 2001
From: chenguoquan1024 <67669059+chenguoquan1024@users.noreply.github.com>
Date: Wed, 22 Jul 2020 14:58:05 +0800
Subject: [PATCH] change /etc/ssl/etcd to etcd_config_dir param (#6408)

* change /etc/ssl/etcd to etcd_config_dir param

* add use etcd_events_data_dir param
---
 roles/etcd/defaults/main.yml                | 2 +-
 roles/kubespray-defaults/defaults/main.yaml | 1 +
 roles/reset/tasks/main.yml                  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roles/etcd/defaults/main.yml b/roles/etcd/defaults/main.yml
index f44c73be6..8d0e6c49b 100644
--- a/roles/etcd/defaults/main.yml
+++ b/roles/etcd/defaults/main.yml
@@ -8,7 +8,7 @@ etcd_events_cluster_enabled: false
 
 etcd_backup_prefix: "/var/backups"
 etcd_data_dir: "/var/lib/etcd"
-etcd_events_data_dir: "/var/lib/etcd-events"
+
 
 etcd_config_dir: /etc/ssl/etcd
 etcd_cert_dir: "{{ etcd_config_dir }}/ssl"
diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml
index 80e6f3b25..f5b84aaf4 100644
--- a/roles/kubespray-defaults/defaults/main.yaml
+++ b/roles/kubespray-defaults/defaults/main.yaml
@@ -505,6 +505,7 @@ pip_extra_args: |-
   {{ pip_extra_args_list|join(' ') }}
 
 etcd_config_dir: /etc/ssl/etcd
+etcd_events_data_dir: "/var/lib/etcd-events"
 etcd_cert_dir: "{{ etcd_config_dir }}/ssl"
 
 typha_enabled: false
diff --git a/roles/reset/tasks/main.yml b/roles/reset/tasks/main.yml
index 6975d226f..5fd98fd6f 100644
--- a/roles/reset/tasks/main.yml
+++ b/roles/reset/tasks/main.yml
@@ -198,8 +198,8 @@
     - "{{ ansible_env.HOME | default('/root') }}/.kube"
     - "{{ ansible_env.HOME | default('/root') }}/.helm"
     - "{{ etcd_data_dir }}"
-    - /var/lib/etcd-events
-    - /etc/ssl/etcd
+    - "{{ etcd_events_data_dir }}"
+    - "{{ etcd_config_dir }}"
     - /var/log/calico
     - /etc/cni
     - "{{ nginx_config_dir }}"