port elevate/liquidtruth role to new storage volume roles

3 files changed, 14 insertions, 21 deletions

diff --git a/inventory/host_vars/ele-lt.yml b/inventory/host_vars/ele-lt.yml
index 1bfcf901..e09026b7 100644
--- a/inventory/host_vars/ele-lt.yml
+++ b/inventory/host_vars/ele-lt.yml
@@ -7,12 +7,19 @@ install:
 network: {}
 
 
-liquidtruth_app_user: lt
-
 sshd_allowusers_host:
   - "{{ liquidtruth_app_user }}"
 
 
+liquidtruth_storage:
+  type: lvm
+  vg: "{{ host_name }}"
+  lv: srv
+  size: 12G
+  fs: xfs
+
+liquidtruth_app_user: lt
+
 liquidtruth_mongodb_root_username: root
 liquidtruth_mongodb_root_password: "{{ vault_liquidtruth_mongodb_root_password }}"
 
diff --git a/roles/elevate/liquidtruth/defaults/main.yml b/roles/elevate/liquidtruth/defaults/main.yml
deleted file mode 100644
index 76aa667a..00000000
--- a/roles/elevate/liquidtruth/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-liquidtruth_srv_disk_size: 12G
diff --git a/roles/elevate/liquidtruth/tasks/main.yml b/roles/elevate/liquidtruth/tasks/main.yml
index 284c50bc..6bb00821 100644
--- a/roles/elevate/liquidtruth/tasks/main.yml
+++ b/roles/elevate/liquidtruth/tasks/main.yml
@@ -1,21 +1,9 @@
 ---
-- name: create logical volume for /srv
-  lvol:
-    vg: "{{ host_name }}"
-    lv: "srv"
-    size: "{{ liquidtruth_srv_disk_size }}"
-
-- name: create filesystem
-  filesystem:
-    fstype: xfs
-    dev: "/dev/mapper/{{ host_name | replace('-', '--') }}-srv"
-
-- name: mount filesystem
-  mount:
-    src: "/dev/mapper/{{ host_name | replace('-', '--') }}-srv"
-    path: /srv
-    fstype: xfs
-    state: mounted
+- name: prepare storage volume for /srv
+  vars:
+    storage_volume: "{{ liquidtruth_storage | combine({'dest': '/srv'}) }}"
+  include_role:
+    name: "storage/{{ liquidtruth_storage.type }}/volume"
 
 - name: install and configure mongodb
   import_tasks: mongodb.yml