From 3367c783146c8c5c1978a9c44b03e5158526ee6d Mon Sep 17 00:00:00 2001 From: vincent Date: Sun, 4 Feb 2024 21:21:22 +0100 Subject: [PATCH] feat: merge user create and config playbook --- ansible/playbooks/create_user.yml | 13 +++++++++++++ ansible/playbooks/user_config.yml | 12 ------------ ansible/site.yml | 1 - 3 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 ansible/playbooks/user_config.yml diff --git a/ansible/playbooks/create_user.yml b/ansible/playbooks/create_user.yml index 9c5db88..fb00351 100644 --- a/ansible/playbooks/create_user.yml +++ b/ansible/playbooks/create_user.yml @@ -14,3 +14,16 @@ - docker become: true become_user: '{{ user.name }}' + +--- +- hosts: all + roles: + - role: user_config + vars: + user_config_username: "{{ user.name }}" + become_user: "{{ user.name }}" + become: true + - role: user_config + vars: + user_config_username: root + become: true diff --git a/ansible/playbooks/user_config.yml b/ansible/playbooks/user_config.yml deleted file mode 100644 index 6e178a0..0000000 --- a/ansible/playbooks/user_config.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- hosts: all - roles: - - role: user_config - vars: - user_config_username: "{{ user.name }}" - become_user: "{{ user.name }}" - become: true - - role: user_config - vars: - user_config_username: root - become: true diff --git a/ansible/site.yml b/ansible/site.yml index 8e97787..221bf5a 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -9,4 +9,3 @@ - import_playbook: playbooks/sssd.yml - import_playbook: playbooks/database.yml - import_playbook: playbooks/rsyncd.yml -- import_playbook: playbooks/create_user.yml