From e7df50e2a68979fc685c9d2ed084e3b29b55b94f Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Tue, 10 Jul 2018 22:51:02 +0200
Subject: [PATCH] refactoring

---
 tasks/install.yml | 34 ++++++++++++++++++++++++++++++++++
 tasks/main.yml    |  4 +---
 tasks/prepare.yml | 36 ------------------------------------
 3 files changed, 35 insertions(+), 39 deletions(-)
 delete mode 100644 tasks/prepare.yml

diff --git a/tasks/install.yml b/tasks/install.yml
index 338d175..bcdbc82 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -16,6 +16,40 @@
     with_items:
       - mongodb-org
       - python2-pip
+
+  - name: Create group '{{ mongodb_system_group }}'
+    group:
+      name: "{{ mongodb_system_group }}"
+      gid: "{{ mongodb_system_gid | default(omit) }}"
+      state: present
+
+  - name: Create user '{{ mongodb_system_user }}'
+    user:
+      name: "{{ mongodb_system_user }}"
+      uid: "{{ mongodb_system_uid | default(omit) }}"
+      group: "{{ mongodb_system_group }}"
+
+  - name: Create db storage dir '{{ mongodb_storage_dbpath }}'
+    file:
+      path: "{{ mongodb_storage_dbpath }}"
+      owner: "{{ mongodb_system_user }}"
+      group: "{{ mongodb_system_group }}"
+      selevel: s0
+      serole : object_r
+      setype: mongod_var_lib_t
+      seuser: system_u
+      state: directory
+    notify: __mongod_restart
+
+  - name: Create log dir '{{ mongodb_systemlog_path | dirname }}'
+    file:
+      path: "{{ mongodb_systemlog_path | dirname }}"
+      owner: "{{ mongodb_system_user }}"
+      group: "{{ mongodb_system_group }}"
+      recurse: yes
+      state: directory
+    when: mongodb_systemlog_destination == 'file'
+    notify: __mongod_restart
   become: True
 
 - name: Install pymongo as ansible dependency
diff --git a/tasks/main.yml b/tasks/main.yml
index fcc2708..a3f0255 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,11 +1,9 @@
 ---
-- include_tasks: prepare.yml
+- include_tasks: install.yml
 
 - include_tasks: storage.yml
   when: mongodb_lvm_enabled
 
-- include_tasks: install.yml
-
 - include_tasks: confi.yml
 
 - name: Check where admin user already exists
diff --git a/tasks/prepare.yml b/tasks/prepare.yml
deleted file mode 100644
index cff83a2..0000000
--- a/tasks/prepare.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- block:
-  - name: Create group '{{ mongodb_system_group }}'
-    group:
-      name: "{{ mongodb_system_group }}"
-      gid: "{{ mongodb_system_gid | default(omit) }}"
-      state: present
-
-  - name: Create user '{{ mongodb_system_user }}'
-    user:
-      name: "{{ mongodb_system_user }}"
-      uid: "{{ mongodb_system_uid | default(omit) }}"
-      group: "{{ mongodb_system_group }}"
-
-  - name: Create db storage dir '{{ mongodb_storage_dbpath }}'
-    file:
-      path: "{{ mongodb_storage_dbpath }}"
-      owner: "{{ mongodb_system_user }}"
-      group: "{{ mongodb_system_group }}"
-      selevel: s0
-      serole : object_r
-      setype: mongod_var_lib_t
-      seuser: system_u
-      state: directory
-    notify: __mongod_restart
-
-  - name: Create log dir '{{ mongodb_systemlog_path | dirname }}'
-    file:
-      path: "{{ mongodb_systemlog_path | dirname }}"
-      owner: "{{ mongodb_system_user }}"
-      group: "{{ mongodb_system_group }}"
-      recurse: yes
-      state: directory
-    when: mongodb_systemlog_destination == 'file'
-    notify: __mongod_restart
-  become: True