Merge pull request #8 from a-okay/master

Deprecation fixes and default behaviour
AerisCloud · Jul 7, 2016 · 2e07221 · 2e07221
2 parents a1ac44a + 42faa5b
commit 2e07221
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -0,0 +1,4 @@
+---
+# Aditional disks that need to be formated and mouted.
+# See README for syntax and usage.
+disk_additional_disks: []
diff --git a/tasks/main.yml b/tasks/main.yml
@@ -19,7 +19,7 @@
   args:
     creates: '{{ item.disk }}1'
     executable: '/bin/bash'
-  with_items: disk_additional_disks
+  with_items: '{{ disk_additional_disks }}'
   tags:
     - disk
 
@@ -29,24 +29,24 @@
     force: '{{ item.force|d(omit) }}'
     fstype: '{{ item.fstype }}'
     opts: '{{ item.fsopts|d(omit) }}'
-  with_items: disk_additional_disks
+  with_items: '{{ disk_additional_disks }}'
   tags:
     - disk
 
 - name: "Ensure the mount directory exists"
   file: >
-    path={{ item.mount }}
-    owner={{ disk_user | default('root') }}
-    group={{ disk_group | default('root') }}
-    state=directory
-  with_items: disk_additional_disks
+    path: '{{ item.mount }}'
+    owner: '{{ disk_user | default('root') }}'
+    group: '{{ disk_group | default('root') }}'
+    state: directory
+  with_items: '{{ disk_additional_disks }}'
   tags:
     - disk
 
 - name: Get UUID for partition
   command: blkid -s UUID -o value "{{ item.disk }}1"
   register: disk_blkid
-  with_items: disk_additional_disks
+  with_items: '{{ disk_additional_disks }}'
   changed_when: False
   tags:
     - disk