diff --git a/roles/make_filesystems/tasks/main.yml b/roles/make_filesystems/tasks/main.yml
index 95afe48ac28c932cc71e05966f72f03b5044e476..1075e7be9296173363b24d036e9078e935d02a29 100644
--- a/roles/make_filesystems/tasks/main.yml
+++ b/roles/make_filesystems/tasks/main.yml
@@ -1,13 +1,35 @@
 ---
+- name: set cinder
+  set_fact: cinder=True
+  when: '"ansible_host_volumes" in hostvars[inventory_hostname]'
+
+- name: set ephemeral
+  set_fact: cinder=False
+  when: '"ansible_host_volumes" not in hostvars[inventory_hostname]'
+
 - name: format volumes
   filesystem: fstype={{ item.fstype }} dev={{ hostvars[inventory_hostname]['ansible_host_volumes'][item.name]['dev'] }}
-  with_items: volumes
+  with_items: "{{ volumes }}"
   sudo: true
+  when: cinder
 
 - name: format volumes
   mount: name={{ item.mntpt }} fstype={{ item.fstype }} src={{ hostvars[inventory_hostname]['ansible_host_volumes'][item.name]['dev'] }} state=mounted
-  with_items: volumes
+  with_items: "{{ volumes }}"
+  sudo: true
+  when: cinder
+
+- name: format volumes
+  filesystem: fstype={{ item.fstype }} dev={{ item.name }}
+  with_items: "{{ volumes }}"
+  sudo: true
+  when: not cinder
+
+- name: format volumes
+  mount: name={{ item.mntpt }} fstype={{ item.fstype }} src={{ item.name }} state=mounted
+  with_items: "{{ volumes }}"
   sudo: true
+  when: not cinder
 
 - name: symlink volumes
   file: force=yes state=link src="{{ item.mntpt }}" path="{{ item.linkto }}"