Merge branch 'Aethylred-fsopts'

.github/workflows/molecule.yml

@@ -10,25 +10,21 @@ on:
       - develop
       - main
       - master
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  lint:
-    # The type of runner that the job will run on
-    runs-on: macos-10.15
+  build:
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       max-parallel: 4
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - uses: actions/cache@v2

defaults/main.yml

@@ -31,6 +31,8 @@ lvm_groups: []
 #       size: 40g
 #       create: true
 #       filesystem: ext4
+#       # Defines options passed to the filesystem creation command
+#       fsopts:
 #       mount: true
 #       mntp: /
 # - vgname: test-vg
@@ -57,6 +59,20 @@ lvm_groups: []
 #   lvnames:
 #   # Set to None to only create LVM VG w/out creating LVM LVOLS
 #    - None
+#   # Using fsopts to create a docker compatible xfs volume
+# - vgname: docker-volumes
+#   disks:
+#     - /dev/vdc
+#     - /dev/vdd
+#   create: true
+#   lvnames:
+#     - lvname: docker_1
+#       size: 100%FREE
+#       create: true
+#       filesystem: xfs
+#       fsopts: -n ftype=1
+#       mount: true
+#       mntp: /var/lib/docker
 
 # Defines if LVM will be managed by role
 # default is false to ensure nothing is changed by accident.

tasks/create_fs.yml

@@ -52,6 +52,7 @@
   filesystem:
     fstype: "{{ lv.filesystem }}"
     dev: "/dev/{{ vg.vgname }}/{{ lv.lvname }}"
+    opts: "{{ lv.fsopts | default(omit) }}"
   become: true
   when:
     - mountedxfs is failed