Merge pull request #17 from stackhpc/no-filesystem

Support not formatting volumes.

README.md

@@ -33,6 +33,8 @@ lvm_groups: []
   #       # Define size of lvol
   #       # 100%FREE, 10g, 1024 (megabytes by default)
   #       size: 5g
+  #       # Defines additional lvcreate options (e.g. stripes, stripesize, etc)
+  #       opts: ''
   #       # Defines if lvol should exist or be removed
   #       # true or false
   #       create: true
@@ -42,6 +44,8 @@ lvm_groups: []
   #       mount: false
   #       # Defines mountpoint for lvol
   #       mntp: []
+  #       # Defines additional mount options (e.g. noatime, noexec, etc)
+  #       mopts: ''
   #     - lvname: root
   #       size: 40g
   #       create: true

defaults/main.yml

@@ -14,6 +14,8 @@ lvm_groups: []
   #       # Define size of lvol
   #       # 100%FREE, 10g, 1024 (megabytes by default)
   #       size: 5g
+  #       # Defines additional lvcreate options (e.g. stripes, stripesize, etc)
+  #       opts: ''
   #       # Defines if lvol should exist or be removed
   #       # true or false
   #       create: true
@@ -23,6 +25,8 @@ lvm_groups: []
   #       mount: false
   #       # Defines mountpoint for lvol
   #       mntp: []
+  #       # Defines additional mount options (e.g. noatime, noexec, etc)
+  #       mopts: ''
   #     - lvname: root
   #       size: 40g
   #       create: true

tasks/manage_lvm.yml

@@ -16,6 +16,7 @@
     lv: "{{ item[1]['lvname'] }}"
     size: "{{ item[1]['size'] }}"
     shrink: no
+    opts: "{{ item[1]['opts'] | default('') }}"
     state: "present"
   become: true
   register: lvm
@@ -45,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:
@@ -53,6 +56,7 @@
     src: "/dev/{{ item[0]['vgname'] }}/{{ item[1]['lvname'] }}"
     fstype: "{{ item[1]['filesystem'] }}"
     state: "mounted"
+    opts: "{{ item[1]['mopts'] | default('defaults') }}"
   become: true
   with_subelements:
     - "{{ lvm_groups }}"
@@ -75,6 +79,8 @@
     - lvnames
   when: >
         lvm['changed'] and
+        item[1]['filesystem'] is defined and
+        item[1]['filesystem'] != "None" and
         item[1]['filesystem'] != "swap" and
         item[1]['filesystem'] != "xfs" and
         item[1]['filesystem'] != "btrfs"
@@ -87,6 +93,7 @@
     - lvnames
   when: >
         lvm['changed'] and
+        item[1]['filesystem'] is defined and
         item[1]['filesystem'] == "xfs"
 
 - name: manage_lvm | resizing swap
@@ -97,6 +104,7 @@
     - lvnames
   when: >
         lvm['changed'] and
+        item[1]['filesystem'] is defined and
         item[1]['filesystem'] == "swap"
 
 - name: manage_lvm | resizing btrfs
@@ -107,13 +115,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: