From b5bf2d266c0fdda8a568db2c298dd2e22a0fab0c Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Thu, 4 Aug 2022 14:47:03 +1200 Subject: [PATCH 1/3] Pass through opts to community.general.filesystem when creating a filesystem --- defaults/main.yml | 16 ++++++++++++++++ tasks/create_fs.yml | 1 + 2 files changed, 17 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 5ade5ec..2626309 100644 --- a/defaults/main.yml +++ b/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. diff --git a/tasks/create_fs.yml b/tasks/create_fs.yml index 1fffca1..5b3d497 100644 --- a/tasks/create_fs.yml +++ b/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 From 74e7ca565247f4a49b09ede90010203d5845f609 Mon Sep 17 00:00:00 2001 From: Aaron Hicks Date: Thu, 4 Aug 2022 14:47:03 +1200 Subject: [PATCH 2/3] Pass through opts to community.general.filesystem when creating a filesystem --- defaults/main.yml | 16 ++++++++++++++++ tasks/create_fs.yml | 1 + 2 files changed, 17 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 5ade5ec..2626309 100644 --- a/defaults/main.yml +++ b/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. diff --git a/tasks/create_fs.yml b/tasks/create_fs.yml index 1fffca1..5b3d497 100644 --- a/tasks/create_fs.yml +++ b/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 From a623248cdf550149756024f798cfcb3301876ec6 Mon Sep 17 00:00:00 2001 From: Larry Smith Jr Date: Wed, 14 Jun 2023 20:43:47 -0400 Subject: [PATCH 3/3] Fixing Molecule lint test --- .github/workflows/molecule.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml index 11ab708..749f2c2 100644 --- a/.github/workflows/molecule.yml +++ b/.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