Browse Source

replace createhome (#9314)

pull/9317/head
Samuel Liu 2 years ago
committed by GitHub
parent
commit
d387d4811f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 9 deletions
  1. 6
      roles/adduser/defaults/main.yml
  2. 2
      roles/adduser/tasks/main.yml
  3. 2
      roles/adduser/vars/coreos.yml
  4. 4
      roles/adduser/vars/debian.yml
  5. 4
      roles/adduser/vars/redhat.yml

6
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) }}"

2
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) }}"

2
roles/adduser/vars/coreos.yml

@ -5,4 +5,4 @@ addusers:
shell: /sbin/nologin
system: yes
group: "{{ kube_cert_group }}"
createhome: no
create_home: no

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

4
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 }}"
Loading…
Cancel
Save