add storage_device roles

1 files changed, 22 insertions, 31 deletions

diff --git a/roles/storage/lvm/volume/tasks/main.yml b/roles/storage/lvm/volume/tasks/main.yml
index 9329965c..d7255739 100644
--- a/roles/storage/lvm/volume/tasks/main.yml
+++ b/roles/storage/lvm/volume/tasks/main.yml
@@ -6,42 +6,33 @@
     that:
     - (lvm_volume.parent.thinpool | default(false))
 
-- name: install thin-provisioning-tools
-  when: (lvm_volume.thinpool | default(false))
-  apt:
-    name: thin-provisioning-tools
-    state: present
-
 - name: create logical volume
   lvol:
     vg: "{{ lvm_volume.parent.vg | default(lvm_volume.vg) }}"
-    lv: "{{ (lvm_volume.thinpool | default(false)) | ternary(omit, lvm_volume.lv) }}"
+    lv: "{{ lvm_volume.lv }}"
     size: "{{ lvm_volume.size }}"
-    thinpool: "{{ (lvm_volume.thinpool | default(false)) | ternary(lvm_volume.lv, (lvm_volume.parent.lv | default(omit))) }}"
+    thinpool: "{{ lvm_volume.parent.lv | default(omit) }}"
 
-- name: create and mount filesystem
-  when: not (lvm_volume.thinpool | default(false))
-  block:
-  - name: create filesystem
-    filesystem:
-      fstype: "{{ lvm_volume.fs }}"
-      dev: "/dev/mapper/{{ lvm_volume.parent.vg | default(lvm_volume.vg) | replace('-', '--') }}-{{ lvm_volume.lv | replace('-', '--') }}"
+- name: create filesystem
+  filesystem:
+    fstype: "{{ lvm_volume.fs }}"
+    dev: "/dev/mapper/{{ lvm_volume.parent.vg | default(lvm_volume.vg) | replace('-', '--') }}-{{ lvm_volume.lv | replace('-', '--') }}"
 
-  - name: mount filesytem
-    mount:
-      src: "/dev/mapper/{{ lvm_volume.parent.vg | default(lvm_volume.vg) | replace('-', '--') }}-{{ lvm_volume.lv | replace('-', '--') }}"
-      path: "{{ lvm_volume.dest }}"
-      fstype: "{{ lvm_volume.fs }}"
-      state: mounted
+- name: mount filesytem
+  mount:
+    src: "/dev/mapper/{{ lvm_volume.parent.vg | default(lvm_volume.vg) | replace('-', '--') }}-{{ lvm_volume.lv | replace('-', '--') }}"
+    path: "{{ lvm_volume.dest }}"
+    fstype: "{{ lvm_volume.fs }}"
+    state: mounted
 
-  - name: set volume owner/group and mode
-    file:
-      state: directory
-      path: "{{ lvm_volume.dest }}"
-      mode: "{{ lvm_volume.mode | default(omit) }}"
-      owner: "{{ lvm_volume.owner | default(omit) }}"
-      group: "{{ lvm_volume.group | default(omit) }}"
+- name: set volume owner/group and mode
+  file:
+    state: directory
+    path: "{{ lvm_volume.dest }}"
+    mode: "{{ lvm_volume.mode | default(omit) }}"
+    owner: "{{ lvm_volume.owner | default(omit) }}"
+    group: "{{ lvm_volume.group | default(omit) }}"
 
-  - name: export volume mountpoint
-    set_fact:
-      storage_volume_mountpoint: "{{ lvm_volume.dest }}"
+- name: export volume mountpoint
+  set_fact:
+    storage_volume_mountpoint: "{{ lvm_volume.dest }}"