diff --git a/roles/etcd/defaults/main.yml b/roles/etcd/defaults/main.yml index f44c73be66e9a3897a138e5f151fee0e9d9f8017..8d0e6c49b4d8af8a67d4fa4f3340f41fa3a6d811 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 80e6f3b25b2eacc30227f290f77e9908df31a92e..f5b84aaf4170118c5d43aedd196d57bdcf7544db 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 6975d226f998f1b16c5f5dd0ff3d7ea3e6d44126..5fd98fd6f917bcc3cc3b9253b16075591e6aefdd 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 }}"