From f81937e9d82bc48f2ee03f6ff462c32bca3da8f0 Mon Sep 17 00:00:00 2001
From: Charlie Mordant <cmordant1@gmail.com>
Date: Wed, 15 Apr 2020 18:52:52 +0200
Subject: [PATCH 1/2] makes xfs mountpoint repeatable

---
 tasks/create_fs.yml | 62 +++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 19 deletions(-)

diff --git a/tasks/create_fs.yml b/tasks/create_fs.yml
index 037baa5..40d876f 100644
--- a/tasks/create_fs.yml
+++ b/tasks/create_fs.yml
@@ -1,4 +1,20 @@
 ---
+- name: manage_lvm | unmounting filesystem(s)
+  mount:
+    path: "{{ lv.mntp }}"
+    src: "/dev/{{ vg.vgname }}/{{ lv.lvname }}"
+    fstype: "{{ lv.filesystem | default(omit) }}"
+    state: "absent"
+  become: true
+  loop: "{{ vg.lvnames }}"
+  loop_control:
+    loop_var: lv
+  when: >
+    (lv is defined and
+    lv != 'None') and
+    (lv.create is defined and
+    not lv.create and
+    lv.filesystem != "swap")
 
 - name: manage_lvm | creating new filesystem on new LVM logical volume(s)
   filesystem:
@@ -25,6 +41,32 @@
     )
   # unable to resize xfs: looks like we've to reference the mountpoint instead of the device
 
+- name: lvm | check already converted
+  # at least xfs is executed twice if the partition has changed in the meantime
+  # then it tries to recreate the fs on the mounted fs which indeed fails...
+  shell: "xfs_info /dev/{{ vg.vgname }}/{{ lv.lvname }} | grep -c 'ftype=1'"
+  become: yes
+  loop: "{{ vg.lvnames }}"
+  loop_control:
+    loop_var: lv
+  register: mountedxfs
+  ignore_errors: True
+  changed_when: no
+  when: >
+    (
+    (lv is defined and item.1 != 'None') and
+    (
+    lv.filesystem is defined and
+    lv.filesystem == "xfs"
+    )
+    and
+    (
+    lv.create is defined and
+    lv.create
+    )
+    )
+
+
 - name: manage_lvm | creating new xfs filesystem on new LVM logical volume(s)
   filesystem:
     fstype: "{{ lv.filesystem }}"
@@ -35,6 +77,7 @@
   become: true
   when: >
     (
+    mountedxfs is failed and
     (vg.create is defined and
     vg.create) and
     (lv is defined and
@@ -46,24 +89,6 @@
     lv.filesystem == 'xfs'
     )
     )
-  # unable to resize xfs: looks like we've to reference the mountpoint instead of the device
-
-- name: manage_lvm | unmounting filesystem(s)
-  mount:
-    path: "{{ lv.mntp }}"
-    src: "/dev/{{ vg.vgname }}/{{ lv.lvname }}"
-    fstype: "{{ lv.filesystem | default(omit) }}"
-    state: "absent"
-  become: true
-  loop: "{{ vg.lvnames }}"
-  loop_control:
-    loop_var: lv
-  when: >
-    (lv is defined and
-    lv != 'None') and
-    (lv.create is defined and
-    not lv.create and
-    lv.filesystem != "swap")
 
 - name: "debug mount"
   loop: "{{ vg.lvnames }}"
@@ -71,7 +96,6 @@
   loop_control:
     loop_var: lv
 
-
 - name: manage_lvm | mounting new filesystem(s)
   mount:
     path: "{{ lv.mntp }}"

From b955a6f073b91773f5f90da878268e74872a99e9 Mon Sep 17 00:00:00 2001
From: Charlie Mordant <cmordant1@gmail.com>
Date: Wed, 15 Apr 2020 18:54:17 +0200
Subject: [PATCH 2/2] remove unwanted newline

---
 tasks/create_fs.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tasks/create_fs.yml b/tasks/create_fs.yml
index 40d876f..c068417 100644
--- a/tasks/create_fs.yml
+++ b/tasks/create_fs.yml
@@ -66,7 +66,6 @@
     )
     )
 
-
 - name: manage_lvm | creating new xfs filesystem on new LVM logical volume(s)
   filesystem:
     fstype: "{{ lv.filesystem }}"