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

@@ -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"

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

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 }}"