From c8a57d0c190325eab29364594156e810eb877a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Thu, 6 Jun 2019 12:34:17 +0200
Subject: [PATCH] Make bootstrap more idempotent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

No need to touch the sudoers.d file each time
Creation and mode setting is handled by lineinfile itself

Change-Id: Ia36e21b04d3a08fab3c748f6298f142c1d73ee6d
Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
---
 ansible/roles/baremetal/tasks/post-install.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/baremetal/tasks/post-install.yml b/ansible/roles/baremetal/tasks/post-install.yml
index 395a677caa..0c044a068d 100644
--- a/ansible/roles/baremetal/tasks/post-install.yml
+++ b/ansible/roles/baremetal/tasks/post-install.yml
@@ -16,18 +16,12 @@
   become: True
   when: create_kolla_user | bool
 
-- name: Create sudoers profile for user kolla
-  file:
-    path: /etc/sudoers.d/kolla-ansible-users
-    state: touch
-    mode: "0640"
-  become: True
-  when: create_kolla_user_sudoers | bool
-
 - name: Grant kolla user passwordless sudo
   lineinfile:
     dest: /etc/sudoers.d/kolla-ansible-users
     state: present
+    create: yes
+    mode: '0640'
     regexp: '^{{ kolla_user }}'
     line: '{{ kolla_user }} ALL=(ALL) NOPASSWD: ALL'
   become: True