From 35198325c4e9ebefcbbeaf5b0278c23536da2a89 Mon Sep 17 00:00:00 2001
From: Gregory Colpart <gcolpart+git@evolix.fr>
Date: Thu, 17 Aug 2017 14:47:37 +0200
Subject: [PATCH] Verify if login exists

---
 admin-users/tasks/user.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/admin-users/tasks/user.yml b/admin-users/tasks/user.yml
index 7de5b778..b36f6eb6 100644
--- a/admin-users/tasks/user.yml
+++ b/admin-users/tasks/user.yml
@@ -1,5 +1,12 @@
 ---
 
+- name: "Test if '{{ user.name }}' exists"
+  command: 'getent passwd {{ user.name }}'
+  register: loginisbusy
+  failed_when: False
+  changed_when: False
+  check_mode: no
+
 - name: "Test if uid exists for '{{ user.name }}'"
   command: 'getent passwd {{ user.uid }}'
   register: uidisbusy
@@ -16,7 +23,7 @@
    shell: /bin/bash
    password: '{{ user.password_hash }}'
    update_password: on_create
-  when: uidisbusy.rc != 0
+  when: loginisbusy.rc != 0 and uidisbusy.rc != 0
 
 - name: "Add Unix account with random uid for '{{ user.name }}'"
   user:
@@ -26,7 +33,7 @@
    shell: /bin/bash
    password: '{{ user.password_hash }}'
    update_password: on_create
-  when: uidisbusy.rc == 0
+  when: loginisbusy.rc != 0 and uidisbusy.rc == 0
 
 - name: "Create {{ admin_users_group }}"
   group: