From d5fdbbb9aa9a61b4d568c72cf10b4c3daca9a786 Mon Sep 17 00:00:00 2001
From: Ethan Paul <e@enp.one>
Date: Sun, 1 Dec 2019 14:15:21 -0500
Subject: [PATCH] Restructure local user preprocessing tasks

---
 tasks/preprocess-local-users.yml | 39 ++++++++++++++++++++++++++++++++
 tasks/users-preprocessing.yml    | 39 --------------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)
 create mode 100644 tasks/preprocess-local-users.yml
 delete mode 100644 tasks/users-preprocessing.yml

diff --git a/tasks/preprocess-local-users.yml b/tasks/preprocess-local-users.yml
new file mode 100644
index 0000000..dbf2602
--- /dev/null
+++ b/tasks/preprocess-local-users.yml
@@ -0,0 +1,39 @@
+---
+- name: Load users variables
+  include_vars:
+    file: users.yml
+
+- name: Reconcile user targets with host targets to get host users
+  set_fact:
+    users_local: >-
+      {{
+      users_local | default([]) + ([item] if item.targets | intersect(local_targets) else [])
+      }}
+  loop: "{{ users }}"
+
+- name: Determine local user names
+  set_fact:
+    users_local_names: "{{ users_local_names | default([]) + [item.name] }}"
+  loop: "{{ users_local }}"
+
+- name: Determine administrative users
+  set_fact:
+    users_local_admin: >-
+      {{
+      users_local_admin | default([]) + ([item] if item.admin | default(False) else [])
+      }}
+  loop: "{{ users_local }}"
+
+- name: Determine existing users
+  shell: 'grep omni /etc/group | cut -d: -f4 | tr "," "\n"'
+  changed_when: false
+  register: users_local_existing
+
+- name: Determine removed users
+  set_fact:
+    users_local_removed: >-
+      {{
+      users_local_removed | default([]) +
+      ([item] if item not in users_local_names else [])
+      }}
+  loop: "{{ users_local_existing.stdout_lines }}"
diff --git a/tasks/users-preprocessing.yml b/tasks/users-preprocessing.yml
deleted file mode 100644
index b8ba2d5..0000000
--- a/tasks/users-preprocessing.yml
+++ /dev/null
@@ -1,39 +0,0 @@
----
-- name: Load users variables
-  include_vars:
-    file: users.yml
-
-- name: Reconcile user targets with host targets to get host users
-  set_fact:
-    local_users: >-
-      {{
-      local_users | default([]) + ([item] if item.targets | intersect(targets) else [])
-      }}
-  loop: "{{ users }}"
-
-- name: Determine local user names
-  set_fact:
-    local_user_names: "{{ local_user_names | default([]) + [item.name] }}"
-  loop: "{{ local_users }}"
-
-- name: Determine administrative users
-  set_fact:
-    local_admin_users: >-
-      {{
-      local_admin_users | default([]) + ([item] if item.admin | default(False) else [])
-      }}
-  loop: "{{ local_users }}"
-
-- name: Determine existing users
-  shell: 'grep omni /etc/group | cut -d: -f4 | tr "," "\n"'
-  changed_when: false
-  register: local_existing_users
-
-- name: Determine removed users
-  set_fact:
-    local_removed_users: >-
-      {{
-      local_removed_users | default([]) +
-      ([item] if item not in local_user_names else [])
-      }}
-  loop: "{{ local_existing_users.stdout_lines }}"