From a0c784797f538fc5393d75589ac48e86c51e88db Mon Sep 17 00:00:00 2001
From: Stig Telfer <stig@stackhpc.com>
Date: Wed, 31 Oct 2018 10:16:44 +0100
Subject: [PATCH 1/3] Support not formatting volumes.

Logic to make the filesystem attribute optional, in situations where
we do not want the volumes formatted.
---
 tasks/manage_lvm.yml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tasks/manage_lvm.yml b/tasks/manage_lvm.yml
index 1b681c9..5a6a62f 100644
--- a/tasks/manage_lvm.yml
+++ b/tasks/manage_lvm.yml
@@ -46,7 +46,9 @@
         (item[1] is defined and
         item[1] != 'None') and
         (item[1]['create'] is defined and
-        item[1]['create']))
+        item[1]['create']) and
+        (item[1]['filesystem'] is defined and
+        item[1]['filesystem'] != 'None'))
 
 - name: manage_lvm | mounting new filesystem(s)
   mount:
@@ -77,6 +79,7 @@
     - lvnames
   when: >
         lvm['changed'] and
+        item[1]['filesystem'] is defined and
         item[1]['filesystem'] != "swap" and
         item[1]['filesystem'] != "xfs" and
         item[1]['filesystem'] != "btrfs"
@@ -89,6 +92,7 @@
     - lvnames
   when: >
         lvm['changed'] and
+        item[1]['filesystem'] is defined and
         item[1]['filesystem'] == "xfs"
 
 - name: manage_lvm | resizing swap
@@ -99,6 +103,7 @@
     - lvnames
   when: >
         lvm['changed'] and
+        item[1]['filesystem'] is defined and
         item[1]['filesystem'] == "swap"
 
 - name: manage_lvm | resizing btrfs
@@ -109,13 +114,14 @@
     - lvnames
   when: >
         lvm['changed'] and
+        item[1]['filesystem'] is defined and
         item[1]['filesystem'] == "btrfs"
 
 - name: manage_lvm | unmounting filesystem(s)
   mount:
     name: "{{ item[1]['mntp'] }}"
     src: "/dev/{{ item[0]['vgname'] }}/{{ item[1]['lvname'] }}"
-    fstype: "{{ item[1]['filesystem'] }}"
+    fstype: "{{ item[1]['filesystem'] | default(omit) }}"
     state: "absent"
   become: true
   with_subelements:

From 4a58cb36cf6d4dd4bb23e86972658be508cca082 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 31 Oct 2018 11:16:27 +0000
Subject: [PATCH 2/3] Update tasks/manage_lvm.yml

Co-Authored-By: oneswig <stig.github@telfer.org>
---
 tasks/manage_lvm.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tasks/manage_lvm.yml b/tasks/manage_lvm.yml
index 5a6a62f..739050a 100644
--- a/tasks/manage_lvm.yml
+++ b/tasks/manage_lvm.yml
@@ -80,7 +80,8 @@
   when: >
         lvm['changed'] and
         item[1]['filesystem'] is defined and
-        item[1]['filesystem'] != "swap" and
+         item[1]['filesystem'] != "None" and
+         item[1]['filesystem'] != "swap" and
         item[1]['filesystem'] != "xfs" and
         item[1]['filesystem'] != "btrfs"
 

From 563aa1effba936340cbaad9766a49f570292edee Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 31 Oct 2018 11:42:20 +0000
Subject: [PATCH 3/3] Fix indentation

---
 tasks/manage_lvm.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/manage_lvm.yml b/tasks/manage_lvm.yml
index 739050a..efcf6cc 100644
--- a/tasks/manage_lvm.yml
+++ b/tasks/manage_lvm.yml
@@ -80,8 +80,8 @@
   when: >
         lvm['changed'] and
         item[1]['filesystem'] is defined and
-         item[1]['filesystem'] != "None" and
-         item[1]['filesystem'] != "swap" and
+        item[1]['filesystem'] != "None" and
+        item[1]['filesystem'] != "swap" and
         item[1]['filesystem'] != "xfs" and
         item[1]['filesystem'] != "btrfs"