From eff3961ab829f8e701bf67ae9909a595a280cfbe Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@geeklabor.de>
Date: Sat, 7 Jul 2018 23:29:34 +0200
Subject: [PATCH] move lvm handler to own task file

---
 tasks/config.yml  | 34 ----------------------------------
 tasks/main.yml    |  4 ++++
 tasks/storage.yml | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 34 deletions(-)
 create mode 100644 tasks/storage.yml

diff --git a/tasks/config.yml b/tasks/config.yml
index 9ed0996..ae9563d 100644
--- a/tasks/config.yml
+++ b/tasks/config.yml
@@ -30,40 +30,6 @@
       state: directory
     when: mongodb_systemlog_destination == 'file'
 
-- block:
-  - name: Create volume group 'mongodb_lvm_vg'
-    lvg:
-      vg: "{{ mongodb_lvm_vg }}"
-      pvs: "{{ mongodb_lvm_pvs|join(',') }}"
-
-  - name: Create logical volume 'mongodb_lvm_lv'
-    lvol:
-      vg: "{{ mongodb_lvm_vg }}"
-      lv: "{{ mongodb_lvm_lv }}"
-      size: "{{ mongodb_lvm_size }}"
-
-  - name: Create filesystem for '/dev/mapper/{{ mongodb_lvm_vg }}-{{ mongodb_lvm_lv }}'
-    filesystem:
-      fstype: "{{ mongodb_lvm_fstype }}"
-      dev: "/dev/mapper/{{ mongodb_lvm_vg }}-{{ mongodb_lvm_lv }}"
-
-  - name: Mount volume to 'mongodb_storage_dbpath'
-    mount:
-      path: "{{ mongodb_storage_dbpath }}"
-      src: "/dev/mapper/{{ mongodb_lvm_vg }}-{{ mongodb_lvm_lv }}"
-      fstype: "{{ mongodb_lvm_fstype }}"
-      state: mounted
-
-  - name: Change permissions for mountpoint
-    file:
-      path: "{{ mongodb_storage_dbpath }}"
-      owner: "{{ mongodb_user }}"
-      group: "{{ mongodb_group }}"
-      mode: 0750
-  become: True
-  when: mongodb_lvm_enabled
-
-- block:
   - name: Deploy configuration file
     template:
       src: etc/mongod.conf.j2
diff --git a/tasks/main.yml b/tasks/main.yml
index 6fc10cf..b145412 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,5 +1,9 @@
 ---
 - include_tasks: install.yml
+
+- include_tasks: storage.yml
+  when: mongodb_lvm_enabled
+
 - include_tasks: config.yml
 
 - name: Check where admin user already exists
diff --git a/tasks/storage.yml b/tasks/storage.yml
new file mode 100644
index 0000000..58359ee
--- /dev/null
+++ b/tasks/storage.yml
@@ -0,0 +1,32 @@
+---
+- block:
+  - name: Create volume group 'mongodb_lvm_vg'
+    lvg:
+      vg: "{{ mongodb_lvm_vg }}"
+      pvs: "{{ mongodb_lvm_pvs|join(',') }}"
+
+  - name: Create logical volume 'mongodb_lvm_lv'
+    lvol:
+      vg: "{{ mongodb_lvm_vg }}"
+      lv: "{{ mongodb_lvm_lv }}"
+      size: "{{ mongodb_lvm_size }}"
+
+  - name: Create filesystem for '/dev/mapper/{{ mongodb_lvm_vg }}-{{ mongodb_lvm_lv }}'
+    filesystem:
+      fstype: "{{ mongodb_lvm_fstype }}"
+      dev: "/dev/mapper/{{ mongodb_lvm_vg }}-{{ mongodb_lvm_lv }}"
+
+  - name: Mount volume to 'mongodb_storage_dbpath'
+    mount:
+      path: "{{ mongodb_storage_dbpath }}"
+      src: "/dev/mapper/{{ mongodb_lvm_vg }}-{{ mongodb_lvm_lv }}"
+      fstype: "{{ mongodb_lvm_fstype }}"
+      state: mounted
+
+  - name: Change permissions for mountpoint
+    file:
+      path: "{{ mongodb_storage_dbpath }}"
+      owner: "{{ mongodb_user }}"
+      group: "{{ mongodb_group }}"
+      mode: 0750
+  become: True