users: move create_users.yml into main.yml in the users role.

This just simplifies the structure a bit, there was really no need to
have that as a separate file.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/users/tasks/create_users.yml b/roles/users/tasks/create_users.yml
deleted file mode 100644 (file)
index 0f971f1..0000000
--- a/roles/users/tasks/create_users.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: Create all users.
-  user:
-    name: "{{ item.name }}"
-    group: sudo
-    state: present
-  with_items: managed_users
-
-- name: Update authorized_keys for each user.
-  authorized_key:
-    user: "{{ item.name }}"
-    key: "{{ item.key }}"
-  with_items: managed_users
-  tags:
-    - pubkeys

diff --git a/roles/users/tasks/main.yml b/roles/users/tasks/main.yml
index 43598caa502395d3e71d76bf19c10d1297471411..2c02f2bcedec19bf099352506c7c2b06e3784037 100644 (file)
--- a/roles/users/tasks/main.yml
+++ b/roles/users/tasks/main.yml
@@ -1,4 +1,17 @@
 ---
-- include: create_users.yml
+- name: Create all users.
+  user:
+    name: "{{ item.name }}"
+    group: sudo
+    state: present
+  with_items: managed_users
   tags:
     - users
+
+- name: Update authorized_keys for each user.
+  authorized_key:
+    user: "{{ item.name }}"
+    key: "{{ item.key }}"
+  with_items: managed_users
+  tags:
+    - pubkeys