C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change /etc/ssl/etcd to etcd_config_dir param (#6408)

Browse source 
* change /etc/ssl/etcd to etcd_config_dir param

* add use etcd_events_data_dir param
This commit is contained in:
chenguoquan1024 2020-07-22 14:58:05 +08:00 committed by GitHub
parent 4990eec4a2
commit 9c48f666ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/etcd/defaults/main.yml
View file

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

1
roles/kubespray-defaults/defaults/main.yaml
View file

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

4
roles/reset/tasks/main.yml
View file

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