Skip to content
Snippets Groups Projects
Unverified Commit 9c48f666 authored by chenguoquan1024's avatar chenguoquan1024 Committed by GitHub
Browse files

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
parent 4990eec4
Branches
Tags
No related merge requests found
...@@ -8,7 +8,7 @@ etcd_events_cluster_enabled: false ...@@ -8,7 +8,7 @@ etcd_events_cluster_enabled: false
etcd_backup_prefix: "/var/backups" etcd_backup_prefix: "/var/backups"
etcd_data_dir: "/var/lib/etcd" etcd_data_dir: "/var/lib/etcd"
etcd_events_data_dir: "/var/lib/etcd-events"
etcd_config_dir: /etc/ssl/etcd etcd_config_dir: /etc/ssl/etcd
etcd_cert_dir: "{{ etcd_config_dir }}/ssl" etcd_cert_dir: "{{ etcd_config_dir }}/ssl"
......
...@@ -505,6 +505,7 @@ pip_extra_args: |- ...@@ -505,6 +505,7 @@ pip_extra_args: |-
{{ pip_extra_args_list|join(' ') }} {{ pip_extra_args_list|join(' ') }}
etcd_config_dir: /etc/ssl/etcd etcd_config_dir: /etc/ssl/etcd
etcd_events_data_dir: "/var/lib/etcd-events"
etcd_cert_dir: "{{ etcd_config_dir }}/ssl" etcd_cert_dir: "{{ etcd_config_dir }}/ssl"
typha_enabled: false typha_enabled: false
......
...@@ -198,8 +198,8 @@ ...@@ -198,8 +198,8 @@
- "{{ ansible_env.HOME | default('/root') }}/.kube" - "{{ ansible_env.HOME | default('/root') }}/.kube"
- "{{ ansible_env.HOME | default('/root') }}/.helm" - "{{ ansible_env.HOME | default('/root') }}/.helm"
- "{{ etcd_data_dir }}" - "{{ etcd_data_dir }}"
- /var/lib/etcd-events - "{{ etcd_events_data_dir }}"
- /etc/ssl/etcd - "{{ etcd_config_dir }}"
- /var/log/calico - /var/log/calico
- /etc/cni - /etc/cni
- "{{ nginx_config_dir }}" - "{{ nginx_config_dir }}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment