small fix

zaxos · May 12, 2017 · 276b3bf · 276b3bf
1 parent 2b48878
commit 276b3bf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/tasks/create-lvm.yml b/tasks/create-lvm.yml
@@ -5,8 +5,8 @@
   command: "parted /dev/{{ item.disk }} --script mklabel gpt mkpart primary 0% 100% set 1 lvm on"
   with_items: "{{ lvm_volumes }}"
   when: >
-    '{{ item.disk }}1' not in lsblk_list.stdout and
-    '{{ item.vg_name }}-{{ item.lv_name }}' not in lsblk_list.stdout and
+    item.disk + "1" not in lsblk_list.stdout and
+    item.vg_name + "-" + item.lv_name not in lsblk_list.stdout and
     (item.state is not defined or item.state == "present") and
     (item.create_partition is defined and item.create_partition)
 
@@ -18,7 +18,7 @@
   with_items: "{{ lvm_volumes }}"
   when: >
     (item.state is not defined or item.state == "present") and
-    '{{ item.vg_name }}-{{ item.lv_name }}' not in lsblk_list.stdout
+    item.vg_name + "-" + item.lv_name not in lsblk_list.stdout
 
 - name: Create logical volume
   lvol:

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -22,16 +22,16 @@
 
 - name: Create lvm volume(s)
   include: create-lvm.yml
-  when: "{{ lvm_volumes }}"
+  when: lvm_volumes
 
 - name: Mount lvm volume(s)
   include: mount-lvm.yml
-  when: "{{ lvm_volumes }}"
+  when: lvm_volumes
 
 - name: Unmount lvm volume(s)
   include: unmount-lvm.yml
-  when: "{{ lvm_volumes }}"
+  when: lvm_volumes
 
 - name: Remove lvm volume(s)
   include: remove-lvm.yml
-  when: "{{ lvm_volumes }}"
+  when: lvm_volumes
diff --git a/tasks/remove-lvm.yml b/tasks/remove-lvm.yml
@@ -24,6 +24,6 @@
   command: "parted /dev/{{ item.disk }} rm 1"
   with_items: "{{ lvm_volumes }}"
   when: >
-    '{{ item.disk }}1' in lsblk_list.stdout and
+    item.disk + "1" in lsblk_list.stdout and
     (item.state is defined and item.state == "absent") and
     (item.create_partition is defined and item.create_partition)