diff --git a/roles/etcd/tasks/gen_certs_script.yml b/roles/etcd/tasks/gen_certs_script.yml index 71d12eece..364b30c4d 100644 --- a/roles/etcd/tasks/gen_certs_script.yml +++ b/roles/etcd/tasks/gen_certs_script.yml @@ -5,8 +5,7 @@ group: "{{ etcd_cert_group }}" state: directory owner: "{{ etcd_owner }}" - mode: "{{ etcd_cert_dir_mode }}" - recurse: true + mode: "0700" - name: "Gen_certs | create etcd script dir (on {{ groups['etcd'][0] }})" file: @@ -145,15 +144,6 @@ - ('k8s_cluster' in group_names) and sync_certs | default(false) and inventory_hostname not in groups['etcd'] -- name: Gen_certs | check certificate permissions - file: - path: "{{ etcd_cert_dir }}" - group: "{{ etcd_cert_group }}" - state: directory - owner: "{{ etcd_owner }}" - mode: "{{ etcd_cert_dir_mode }}" - recurse: true - # This is a hack around the fact kubeadm expect the same certs path on all kube_control_plane # TODO: fix certs generation to have the same file everywhere # OR work with kubeadm on node-specific config diff --git a/roles/etcd_defaults/defaults/main.yml b/roles/etcd_defaults/defaults/main.yml index fb79d94b4..d42ad96aa 100644 --- a/roles/etcd_defaults/defaults/main.yml +++ b/roles/etcd_defaults/defaults/main.yml @@ -18,7 +18,6 @@ etcd_backup_retention_count: -1 force_etcd_cert_refresh: true etcd_config_dir: /etc/ssl/etcd etcd_cert_dir: "{{ etcd_config_dir }}/ssl" -etcd_cert_dir_mode: "0700" etcd_cert_group: root # Note: This does not set up DNS entries. It simply adds the following DNS # entries to the certificate