port vm/host/base role to new storage volume roles

6 files changed, 20 insertions, 32 deletions

diff --git a/inventory/host_vars/ch-gnocchi.yml b/inventory/host_vars/ch-gnocchi.yml
index ff27a081..f0b5ab11 100644
--- a/inventory/host_vars/ch-gnocchi.yml
+++ b/inventory/host_vars/ch-gnocchi.yml
@@ -25,7 +25,8 @@ apt_repo_components:
   - non-free ## for microcode updates
 
 
-installer_lvm:
+installer_storage:
+  type: lvm
   vg: "{{ host_name }}"
   lv: installer
   size: 10G
diff --git a/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml
index 12b54004..f64c7a25 100644
--- a/inventory/host_vars/ch-prometheus.yml
+++ b/inventory/host_vars/ch-prometheus.yml
@@ -43,7 +43,8 @@ apt_repo_components:
 ssh_keys_root_extra:
   - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9AkOBxvf1wZ0B3wEyf7O3GbaIGx5o2f6cVuQIrOjeFfgMSAr1LwiB/gmHhMSEq6OSauD37TA5yDIrzk6NPPjVs/wiklsHgYtTqIxSPItTZFPX4gLvNwwGuRvEW9bTEiHd+bVPIiIT7HOje0kgacjan44rdgppX9DgcUp2j7uSZZabsxDCS/ms0slhwBNU1gtR31PoQ56vIya23D2uMauNAbRJzDEOfAjy4pHF8njYcXPas/yrbLi8PUZ1YO1u/AZto96EIYfHaCLWlstqeCX+R2JrTunvfTr8TF3AkFw8lHMzk3neUR+tPAAFQaqeTlqGPiSNq1Oyf+52XR16qwhd equinox@mail
 
-installer_lvm:
+installer_storage:
+  type: lvm
   vg: "{{ host_name }}"
   lv: installer
   size: 10G
diff --git a/roles/docker/engine/tasks/main.yml b/roles/docker/engine/tasks/main.yml
index 7bfd3eeb..55cd5787 100644
--- a/roles/docker/engine/tasks/main.yml
+++ b/roles/docker/engine/tasks/main.yml
@@ -17,7 +17,7 @@
 - name: prepare storage volume for /var/lib/docker
   when: docker_storage is defined
   vars:
-    storage_volume: "{{ docker_storage | combine({'dest': '/var/lib/docker'})}}"
+    storage_volume: "{{ docker_storage | combine({'dest': '/var/lib/docker'}) }}"
   include_role:
     name: "storage/{{ docker_storage.type }}/volume"
 
diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index 80fd67a1..a104b660 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -5,7 +5,7 @@
 - name: prepare storage volume for /var/lib/kubelet
   when: kubelet_storage is defined
   vars:
-    storage_volume: "{{ kubelet_storage | combine({'dest': '/var/lib/kubelet'})}}"
+    storage_volume: "{{ kubelet_storage | combine({'dest': '/var/lib/kubelet'}) }}"
   include_role:
     name: "storage/{{ kubelet_storage.type }}/volume"
 
diff --git a/roles/streaming/rtmp/streamer/tasks/main.yml b/roles/streaming/rtmp/streamer/tasks/main.yml
index 0e844c72..c5caf471 100644
--- a/roles/streaming/rtmp/streamer/tasks/main.yml
+++ b/roles/streaming/rtmp/streamer/tasks/main.yml
@@ -2,7 +2,7 @@
 - name: prepare rtmp-streamer storage volume
   when: rtmp_streamer_storage is defined
   vars:
-    storage_volume: "{{ rtmp_streamer_storage | combine({'dest': rtmp_streamer_base_path})}}"
+    storage_volume: "{{ rtmp_streamer_storage | combine({'dest': rtmp_streamer_base_path}) }}"
   include_role:
     name: "storage/{{ rtmp_streamer_storage.type }}/volume"
 
diff --git a/roles/vm/host/base/tasks/main.yml b/roles/vm/host/base/tasks/main.yml
index f789d2e0..0a1f2182 100644
--- a/roles/vm/host/base/tasks/main.yml
+++ b/roles/vm/host/base/tasks/main.yml
@@ -2,13 +2,13 @@
 - name: install dependencies
   apt:
     name:
-      - qemu-kvm
-      - # configuration package, pulls in libvirt-clients and libvirt-daemon
-        libvirt-daemon-system
-      - "{{ python_basename }}-libvirt"
-      - haveged
-      - bridge-utils
-      - acl
+    - qemu-kvm
+    - # configuration package, pulls in libvirt-clients and libvirt-daemon
+      libvirt-daemon-system
+    - "{{ python_basename }}-libvirt"
+    - haveged
+    - bridge-utils
+    - acl
     state: present
 
 - name: configure haveged
@@ -22,26 +22,12 @@
   when: "'zfs' in vm_host"
   include_tasks: zfs.yml
 
-- name: create lvm-based disk for installers
-  when: installer_lvm is defined
-  block:
-  - name: create logical volume
-    lvol:
-      vg: "{{ installer_lvm.vg }}"
-      lv: "{{ installer_lvm.lv }}"
-      size: "{{ installer_lvm.size }}"
-
-  - name: create filesystem
-    filesystem:
-      fstype: "{{ installer_lvm.fs }}"
-      dev: "/dev/mapper/{{ installer_lvm.vg | replace('-', '--') }}-{{ installer_lvm.lv | replace('-', '--') }}"
-
-  - name: mount filesytem
-    mount:
-      src: "/dev/mapper/{{ installer_lvm.vg | replace('-', '--') }}-{{ installer_lvm.lv | replace('-', '--') }}"
-      path: "{{ installer_base_path }}"
-      fstype: "{{ installer_lvm.fs }}"
-      state: mounted
+- name: prepare storage volume for installers
+  when: installer_storage is defined
+  vars:
+    storage_volume: "{{ installer_storage | combine({'dest': installer_base_path}) }}"
+  include_role:
+    name: "storage/{{ installer_storage.type }}/volume"
 
 - name: make sure installer directory exists
   file: