From d387d4811f8daf6177835f0bf0a4544683e88166 Mon Sep 17 00:00:00 2001 From: Samuel Liu Date: Fri, 23 Sep 2022 15:26:39 +0800 Subject: [PATCH] replace createhome (#9314) --- roles/adduser/defaults/main.yml | 6 +++--- roles/adduser/tasks/main.yml | 2 +- roles/adduser/vars/coreos.yml | 2 +- roles/adduser/vars/debian.yml | 4 ++-- roles/adduser/vars/redhat.yml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/adduser/defaults/main.yml b/roles/adduser/defaults/main.yml index 3c692343a..faf258d79 100644 --- a/roles/adduser/defaults/main.yml +++ b/roles/adduser/defaults/main.yml @@ -7,13 +7,13 @@ addusers: etcd: name: etcd comment: "Etcd user" - createhome: no + create_home: no system: yes shell: /sbin/nologin kube: name: kube comment: "Kubernetes user" - createhome: no + create_home: no system: yes shell: /sbin/nologin group: "{{ kube_cert_group }}" @@ -24,4 +24,4 @@ adduser: comment: "{{ user.comment|default(None) }}" shell: "{{ user.shell|default(None) }}" system: "{{ user.system|default(None) }}" - createhome: "{{ user.createhome|default(None) }}" + create_home: "{{ user.create_home|default(None) }}" diff --git a/roles/adduser/tasks/main.yml b/roles/adduser/tasks/main.yml index 45b2de9b8..51dd5bb06 100644 --- a/roles/adduser/tasks/main.yml +++ b/roles/adduser/tasks/main.yml @@ -7,7 +7,7 @@ - name: User | Create User user: comment: "{{ user.comment|default(omit) }}" - createhome: "{{ user.createhome|default(omit) }}" + create_home: "{{ user.create_home|default(omit) }}" group: "{{ user.group|default(user.name) }}" home: "{{ user.home|default(omit) }}" shell: "{{ user.shell|default(omit) }}" diff --git a/roles/adduser/vars/coreos.yml b/roles/adduser/vars/coreos.yml index 9fa93e45b..5c258df6e 100644 --- a/roles/adduser/vars/coreos.yml +++ b/roles/adduser/vars/coreos.yml @@ -5,4 +5,4 @@ addusers: shell: /sbin/nologin system: yes group: "{{ kube_cert_group }}" - createhome: no + create_home: no diff --git a/roles/adduser/vars/debian.yml b/roles/adduser/vars/debian.yml index 4a47fbc70..99e5b3821 100644 --- a/roles/adduser/vars/debian.yml +++ b/roles/adduser/vars/debian.yml @@ -2,14 +2,14 @@ addusers: - name: etcd comment: "Etcd user" - createhome: yes + create_home: yes home: "{{ etcd_data_dir }}" system: yes shell: /sbin/nologin - name: kube comment: "Kubernetes user" - createhome: no + create_home: no system: yes shell: /sbin/nologin group: "{{ kube_cert_group }}" diff --git a/roles/adduser/vars/redhat.yml b/roles/adduser/vars/redhat.yml index 4a47fbc70..99e5b3821 100644 --- a/roles/adduser/vars/redhat.yml +++ b/roles/adduser/vars/redhat.yml @@ -2,14 +2,14 @@ addusers: - name: etcd comment: "Etcd user" - createhome: yes + create_home: yes home: "{{ etcd_data_dir }}" system: yes shell: /sbin/nologin - name: kube comment: "Kubernetes user" - createhome: no + create_home: no system: yes shell: /sbin/nologin group: "{{ kube_cert_group }}"