Merge pull request #48 from Tcharl/rebased

XFS resize

.github/workflows/molecule.yml

@@ -34,67 +34,8 @@ jobs:
           sudo apt update
           sudo apt -y install python3-setuptools python3 python3-pip docker vagrant
           sudo pip3 install wheel
-          sudo pip3 install docker molecule testinfra yamllint ansible-lint flake8 molecule-vagrant
+          sudo pip3 install molecule testinfra yamllint ansible-lint flake8 molecule-vagrant
 
       - name: molecule lint
         run: |
           molecule lint
-
-  molecule:
-
-    runs-on: ubuntu-latest
-    if: "false"
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: configure keyboard layout
-        run: |
-          echo XKBLAYOUT='us' > /etc/default/keyboard
-
-      - name: install virtualization stack
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: |
-          sudo apt-get update
-          sudo apt -y install cpu-checker
-          kvm-ok
-  # shit happens here, containerization sucks... that was worth the try
-
-      - name: install virtualization stack
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: |
-          sudo apt -y install policycoreutils-python-utils qemu-kvm qemu-utils libvirt-clients libvirt-daemon-system bridge-utils python3-libvirt libnss-libvirt libguestfs-tools virtinst virt-top genisoimage libvirt-dev libvirt-bin
-
-      - name: install vagrant
-        env:
-          VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT: 1
-        run: |
-          wget https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb
-          sudo apt -y install ./vagrant_2.2.7_x86_64.deb
-          vagrant plugin install vagrant-persistent-storage
-          vagrant plugin install vagrant-libvirt
-          sudo groupadd --system libvirt
-          sudo usermod -a -G libvirt $(whoami)
-          sudo /etc/init.d/libvirtd restart
-
-      - name: Install molecule
-        run: |
-          sudo apt -y install python3-setuptools
-          pip3 install molecule-vagrant wheel
-
-      - name: create molecule vm
-        env:
-          LC_ALL: C.UTF-8
-          LANG: C.UTF-8
-        run: |
-          molecule create --scenario-name kvm
-
-      - name: verify
-        run: |
-          molecule verify
-
-      - name: teardown
-        run: |
-          molecule destroy

.travis.yml

@@ -1,15 +1,32 @@
 ---
-sudo: required
+dist: bionic
+
 language: python
-services:
+python:
-  - docker
+  - "3.8"
+
 before_install:
-  - sudo apt-get -qq update
+  - |
-install:
+    sudo apt -y install bridge-utils dnsmasq-base ebtables libvirt-bin libvirt-dev qemu-kvm qemu-utils ruby-dev
-  - pip3 install -r requirements.txt
+
-  - ansible --version
+  - |
-  - molecule --version
+    wget https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb
+    sudo apt -y install ./vagrant_2.2.7_x86_64.deb
+    sudo vagrant plugin install vagrant-libvirt
+
+  - |
+    sudo apt-get -y purge python3-openssl && sudo apt-get -y autoremove
+    sudo apt-get update && sudo apt-get install -y ca-certificates curl gcc iproute2 python3 python3-dev sudo
+    curl -skL https://bootstrap.pypa.io/get-pip.py | sudo -H python3
+    sudo pip3 install wheel
+    sudo pip3 install netaddr python-vagrant yamllint testinfra flake8
+    sudo pip3 install ansible ansible-lint
+    sudo pip3 install -I molecule molecule-vagrant
+
 script:
-  - molecule lint
+  - |
+    sudo molecule test --scenario-name kvm
+    sudo molecule test --scenario-name kvmsinglelv
+    sudo molecule test --scenario-name kvmonlyvg
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/

CHANGELOG.md

@@ -1,6 +1,50 @@
+commit 881d5d77fa435ccaa026c3341d0d2ac1fb537b98
+Author: Larry Smith Jr <mrlesmithjr@gmail.com>
+Date: Mon Apr 27 11:26:18 2020 -0400
+
+    Fixing syntax issue for wantlist
+
+commit 89360e3ffef9ff1dbbb5ad525a7ee1d77e6b8895
+Author: Larry Smith Jr <mrlesmithjr@gmail.com>
+Date: Mon Apr 27 11:16:02 2020 -0400
+
+    Trying to fix the subelements lookup for a single element
+
+    This addresses #42. Will need to do some validation testing, etc.
+
+commit c6a7034e4b0b381c5c5b44a15ce7baad7eab9c1b
+Author: Charlie Mordant <cmordant1@gmail.com>
+Date: Fri Apr 24 17:22:07 2020 +0200
+
+    remove unused molecule env property
+
+commit 883055c33f2d6b4c0df8e61ce49771c451905334
+Author: Charlie Mordant <cmordant1@gmail.com>
+Date: Thu Apr 23 19:38:35 2020 +0200
+
+    lint
+
+commit 325c2d6240022fe17abf40dffee842ccf79543f1
+Author: Charlie Mordant <cmordant1@gmail.com>
+Date: Thu Apr 23 19:25:09 2020 +0200
+
+    install xfs
+
+commit 4a1177e420fd9632f77d07ce0a19f89a1515f8eb
+Author: Charlie Mordant <cmordant1@gmail.com>
+Date: Tue Apr 21 19:01:29 2020 +0200
+
+    use xfs_info on mountpoint instead of lvm
+
+commit 7fd5a8eec9f4b5110929862056ab88c4db3f14de
+Author: Larry Smith Jr <mrlesmithjr@gmail.com>
+Date: Sun Apr 19 01:59:29 2020 -0400
+
+    Only doing a Molecule lint at this time
+
 commit 7e2a076b0a8155015fd21502db860fa89a2114b3
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Sun Apr 19 01:44:38 2020 -0400
+Date: Sun Apr 19 01:44:38 2020 -0400
 
     Added Python requirements for testing, etc.
 
@@ -8,79 +52,79 @@ Date:   Sun Apr 19 01:44:38 2020 -0400
 
 commit dadb9f24f7ebc2752e6495c4c3569bdee5e0cc68
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Fri Apr 17 13:12:06 2020 +0200
+Date: Fri Apr 17 13:12:06 2020 +0200
 
     remove unwanted files
 
 commit 2f63eab727cf7b0b389d0d0cc1a1c7236b71f839
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Fri Apr 17 12:56:31 2020 +0200
+Date: Fri Apr 17 12:56:31 2020 +0200
 
     code smells
 
 commit 050f8a56f10d81f7827be53b8c769b1aa5021c00
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Wed Apr 15 19:08:34 2020 +0200
+Date: Wed Apr 15 19:08:34 2020 +0200
 
     typo in check
 
 commit b955a6f073b91773f5f90da878268e74872a99e9
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Wed Apr 15 18:54:17 2020 +0200
+Date: Wed Apr 15 18:54:17 2020 +0200
 
     remove unwanted newline
 
 commit f81937e9d82bc48f2ee03f6ff462c32bca3da8f0
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Wed Apr 15 18:52:52 2020 +0200
+Date: Wed Apr 15 18:52:52 2020 +0200
 
     makes xfs mountpoint repeatable
 
 commit 1c3818e5d06887c01dc0a4b88a39c0561a446300
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Wed Apr 15 17:34:53 2020 +0200
+Date: Wed Apr 15 17:34:53 2020 +0200
 
     mistake on remove volume
 
 commit 47f8dae16a096050dccbb8d161f4a18946a6ae73
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Wed Apr 15 17:13:38 2020 +0200
+Date: Wed Apr 15 17:13:38 2020 +0200
 
     github action lint
 
 commit 96fa78d6d099d0a48642d377d3e7f30a0c554bdf
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Wed Apr 15 17:07:33 2020 +0200
+Date: Wed Apr 15 17:07:33 2020 +0200
 
     remove deprecated machines
 
 commit 17e8ec1058c5cb66b21b15a8d3912ac9980508a9
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Wed Apr 15 16:56:18 2020 +0200
+Date: Wed Apr 15 16:56:18 2020 +0200
 
     configured molecule and fix xfs on centos
 
 commit ba5d929fce982af9baa44cfe8ad0b3079133f444
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Wed Apr 15 15:14:30 2020 +0200
+Date: Wed Apr 15 15:14:30 2020 +0200
 
     use dots instead of carets
 
 commit ea9109220bb268b5f14e75e38d9fb32c2d79bae5
 Author: Charlie Mordant <cmordant1@gmail.com>
-Date:   Wed Apr 15 14:33:41 2020 +0200
+Date: Wed Apr 15 14:33:41 2020 +0200
 
     molecule test and idempotence
 
 commit d8b3a4e93257dfeb79bc8d4ef349acb53f0019dc
 Author: Samuel Mutel <smu-dw@deveryware.net>
-Date:   Mon Oct 14 12:21:03 2019 +0200
+Date: Mon Oct 14 12:21:03 2019 +0200
 
     bug: Resize XFS parts is not working
 
 commit b15ecea51d0045a89aae24e4b0c108b35f060b2c
 Author: Tony Peña <emperor.cu@gmail.com>
-Date:   Wed Jun 26 14:56:13 2019 +0200
+Date: Wed Jun 26 14:56:13 2019 +0200
 
     Update debian.yml
 
@@ -88,13 +132,13 @@ Date:   Wed Jun 26 14:56:13 2019 +0200
 
 commit 9788ee5df68798ad94f11c8133b1d62ff409d0e8
 Author: Michele Caputo <mikap83@gmail.com>
-Date:   Mon Apr 8 14:16:04 2019 +0200
+Date: Mon Apr 8 14:16:04 2019 +0200
 
     issue #23: extra parenthesis
 
 commit 0f428a0e40d71aea410fbc1aa329203c0b4f15cd
 Author: faisalnizam <faisal@logiik.com>
-Date:   Tue Mar 26 10:48:45 2019 +0400
+Date: Tue Mar 26 10:48:45 2019 +0400
 
     FIX LINT FOR BUILD
 
@@ -102,7 +146,7 @@ Date:   Tue Mar 26 10:48:45 2019 +0400
 
 commit 8957630c04b8befa99c08ed667e43d95198202ce
 Author: faisalnizam <faisal@logiik.com>
-Date:   Tue Mar 26 10:40:11 2019 +0400
+Date: Tue Mar 26 10:40:11 2019 +0400
 
     Adding SWAP FileSystem Exception
 
@@ -112,37 +156,37 @@ Date:   Tue Mar 26 10:40:11 2019 +0400
 
 commit 183087e767cbce08ce2da1a3b04f47d3fc03a7e6
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Tue Apr 2 08:03:42 2019 -0400
+Date: Tue Apr 2 08:03:42 2019 -0400
 
     Resolves #21
 
 commit b3ef85d4f738597260d9db0d90e84d0f8721259a
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Wed Dec 5 08:39:10 2018 -0500
+Date: Wed Dec 5 08:39:10 2018 -0500
 
     Added skip codes for ansible-lint
 
 commit 9f4afa7afb3fedc270c44ff1fa357da4b87845c0
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Wed Dec 5 08:00:13 2018 -0500
+Date: Wed Dec 5 08:00:13 2018 -0500
 
     Fixing Travis testing and yamllint issues
 
 commit 5603c5f6b0899a1b2cdeeeb3c035eb6249e96fa7
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Wed Dec 5 07:51:31 2018 -0500
+Date: Wed Dec 5 07:51:31 2018 -0500
 
     Added Travis testing and hooks for galaxy
 
 commit 563aa1effba936340cbaad9766a49f570292edee
 Author: Mark Goddard <mark@stackhpc.com>
-Date:   Wed Oct 31 11:42:20 2018 +0000
+Date: Wed Oct 31 11:42:20 2018 +0000
 
     Fix indentation
 
 commit 4a58cb36cf6d4dd4bb23e86972658be508cca082
 Author: Mark Goddard <mark@stackhpc.com>
-Date:   Wed Oct 31 11:16:27 2018 +0000
+Date: Wed Oct 31 11:16:27 2018 +0000
 
     Update tasks/manage_lvm.yml
 
@@ -150,7 +194,7 @@ Date:   Wed Oct 31 11:16:27 2018 +0000
 
 commit a0c784797f538fc5393d75589ac48e86c51e88db
 Author: Stig Telfer <stig@stackhpc.com>
-Date:   Wed Oct 31 10:16:44 2018 +0100
+Date: Wed Oct 31 10:16:44 2018 +0100
 
     Support not formatting volumes.
 
@@ -159,13 +203,13 @@ Date:   Wed Oct 31 10:16:44 2018 +0100
 
 commit 66368de1d3d2b6712cbf66fc3dd0962705bf86f9
 Author: David Castellanos <dcastellanos@fintonic.com>
-Date:   Mon Dec 18 00:33:45 2017 +0100
+Date: Mon Dec 18 00:33:45 2017 +0100
 
     Add opts and mopts support
 
 commit 386cc28bdb58886ed492d3438c9cb088d36de161
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Sun Jun 11 14:57:53 2017 -0400
+Date: Sun Jun 11 14:57:53 2017 -0400
 
     Addresses issue #10
 
@@ -173,7 +217,7 @@ Date:   Sun Jun 11 14:57:53 2017 -0400
 
 commit 0d255cb5ce9e6016a503203c2ed39a70fb0ccd9c
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Fri May 5 09:12:25 2017 -0400
+Date: Fri May 5 09:12:25 2017 -0400
 
     Fixes issue #8
 
@@ -181,25 +225,25 @@ Date:   Fri May 5 09:12:25 2017 -0400
 
 commit f2d06d0d46086da0191b4dbde0d420e709e3ea01
 Author: Stefan Heimberg <kontakt@stefanheimberg.ch>
-Date:   Thu Apr 6 00:25:55 2017 +0200
+Date: Thu Apr 6 00:25:55 2017 +0200
 
     added support for btrfs
 
 commit 7749d0c62a6e1539aff94c57fd2c0eeaf43dd1a0
 Author: Kevin Loveland <kevin.loveland@gmail.com>
-Date:   Fri Nov 18 10:26:16 2016 -0800
+Date: Fri Nov 18 10:26:16 2016 -0800
 
     Fixed issue with idempotency of lvol module. See ansible-module-extras issue #428
 
 commit 3ad965237280d534f0aab0027f9ef61701354e8b
 Author: Kevin Loveland <kevin.loveland@gmail.com>
-Date:   Thu Nov 17 15:17:26 2016 -0800
+Date: Thu Nov 17 15:17:26 2016 -0800
 
     Changes to adjust to removal of bare vars in Ansible 2.2
 
 commit a82877c290cfe0b62eda90d8874b8e2b62402946
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Sun Oct 2 09:58:47 2016 -0400
+Date: Sun Oct 2 09:58:47 2016 -0400
 
     First commit of CHANGELOG
 
@@ -207,72 +251,72 @@ Date:   Sun Oct 2 09:58:47 2016 -0400
 
 commit 99366fa547faccb0359dd8d3b19cec802640eb95
 Author: Rohit Kothari <rohietkothari@gmail.com>
-Date:   Thu Sep 29 17:59:19 2016 -0700
+Date: Thu Sep 29 17:59:19 2016 -0700
 
     Replace system-storage-manager with lvm2 in centos
 
 commit ca1535d774b4e3310fc993841f1f99400612c7a5
 Author: Olivier LOCARD <olivier.locard@deveryware.com>
-Date:   Fri Sep 23 16:21:07 2016 +0200
+Date: Fri Sep 23 16:21:07 2016 +0200
 
     Add xfs_growfs for xfs systemfile type.
 
 commit bb87fa8dbff5df50ed376db74a6d2b95f64fd745
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Tue Nov 3 10:39:58 2015 -0500
+Date: Tue Nov 3 10:39:58 2015 -0500
 
     updated vars and conditionals
 
 commit 49b20e2e4a80581f1c53559ff4073b3384eae28c
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Tue Nov 3 10:24:54 2015 -0500
+Date: Tue Nov 3 10:24:54 2015 -0500
 
     updated when conditions
 
 commit 0232734bed92e976376d4c9f2550b515f72f3d54
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Tue Nov 3 10:22:09 2015 -0500
+Date: Tue Nov 3 10:22:09 2015 -0500
 
     updated tasks to only work when lvnames is defined
 
 commit 9f592112095208843da1fd69a658bd49c163a7bb
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Tue Nov 3 09:37:38 2015 -0500
+Date: Tue Nov 3 09:37:38 2015 -0500
 
     updated vars and meta
 
 commit 686455514d8bc0da70b3440dbc5afe669188d333
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Tue Nov 3 09:22:00 2015 -0500
+Date: Tue Nov 3 09:22:00 2015 -0500
 
     cleaned up and fixed all tasks including swap
 
 commit 9f5c61e25599a130e1625e879438561cc1f6a437
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Mon Nov 2 23:38:38 2015 -0500
+Date: Mon Nov 2 23:38:38 2015 -0500
 
     added new task
 
 commit a5103ff6396138f531cf8457f16706b6fc90d1d1
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Mon Nov 2 23:38:23 2015 -0500
+Date: Mon Nov 2 23:38:23 2015 -0500
 
     changing role tasks and vars
 
 commit c776e9f339f0bcfe987aa571d29411ac44a29526
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Mon Nov 2 21:50:07 2015 -0500
+Date: Mon Nov 2 21:50:07 2015 -0500
 
     updated meta
 
 commit 46e0fd1fc2477693fc66aa4b38ac7bde19087047
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Mon Nov 2 21:23:59 2015 -0500
+Date: Mon Nov 2 21:23:59 2015 -0500
 
     updated meta
 
 commit d1d99b2f17d3bc46a479af5d01a976686429b7ce
 Author: Larry Smith Jr <mrlesmithjr@gmail.com>
-Date:   Mon Nov 2 21:23:03 2015 -0500
+Date: Mon Nov 2 21:23:03 2015 -0500
 
     first commit

README.md

@@ -1,6 +1,6 @@
-# Role Name
+# ansible-manage-lvm
 
-An [Ansible] role to manage LVM Groups/Logical Volumes.
+Ansible role to manage LVM Groups/Logical Volumes.
 
 > NOTE: Can be used to create, extend or resize LVM Groups and volumes.
 
@@ -9,78 +9,9 @@ An [Ansible] role to manage LVM Groups/Logical Volumes.
 Devices/disks to be members of the LVM setup **must be** identified prior to
 using this role.
 
-> NOTE: Ensure that you select the correct devices/disks.
->
-> NOTE: To create an LVM VG w/out creating LVM LVOLS...define lvname w/ var as
-> `None` as in the below example.
-
 ## Role Variables
 
-```yaml
+[defaults/main.yml](defaults/main.yml)
----
-# defaults file for ansible-manage-lvm
-lvm_groups: []
-  # - vgname: ubuntu-vg
-  #   disks:
-  #     - /dev/sda5
-  #     - /dev/sdc
-  #     - /dev/sdd
-  #   # defines if VG should exist or be removed
-  #   # true or false
-  #   create: true
-  #   lvnames:
-  #     - lvname: swap_1
-  #       # 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
-  #       # Defines filesystem to format lvol as
-  #       filesystem: swap
-  #       # Defines if filesystem should be mounted
-  #       mount: false
-  #       # Defines mountpoint for lvol
-  #       mntp: []
-  #       # Defines additional mount options (e.g. noatime, noexec, etc)
-  #       mopts: ''
-  #     - lvname: root
-  #       size: 40g
-  #       create: true
-  #       filesystem: ext4
-  #       mount: true
-  #       mntp: /
-  # - vgname: test-vg
-  #   disks:
-  #     - /dev/sdb
-  #   create: true
-  #   lvnames:
-  #     - lvname: test_1
-  #       size: 5g
-  #       create: true
-  #       filesystem: ext4
-  #       mount: true
-  #       mntp: /mnt/test_1
-  #     - lvname: test_2
-  #       size: 10g
-  #       create: true
-  #       filesystem: ext4
-  #       mount: true
-  #       mntp: /mnt/test_2
-  # - vgname: cinder-volumes
-  #   disks:
-  #     - /dev/cciss/c0d1
-  #   create: true
-  #   lvnames:
-  #   # Set to None to only create LVM VG w/out creating LVM LVOLS
-  #    - None
-
-# Defines if LVM will be managed by role
-# default is false to ensure nothing is changed by accident.
-manage_lvm: false
-```
 
 ## Dependencies
 
@@ -88,48 +19,16 @@ None
 
 ## Example Playbook
 
-```yaml
+[playbook.yml](playbook.yml)
----
-- hosts: test-nodes
-  vars:
-    lvm_groups:
-      - vgname: test-vg
-        disks:
-          - /dev/sdb
-          - /dev/sdc
-        create: true
-        lvnames:
-          - lvname: test_1
-            size: 5g
-            create: true
-            filesystem: ext4
-            mount: true
-            mntp: /mnt/test_1
-          - lvname: test_2
-            size: 10g
-            create: true
-            filesystem: ext4
-            mount: true
-            mntp: /mnt/test_2
-    manage_lvm: true
-    pri_domain_name: 'test.vagrant.local'
-  roles:
-    - role: ansible-manage-lvm
-  tasks:
-```
 
 ## License
 
-BSD
+MIT
 
 ## Author Information
 
 Larry Smith Jr.
 
--   [@mrlesmithjr]
+- [@mrlesmithjr](https://twitter.com/mrlesmithjr)
--   <http://everythingshouldbevirtual.com>
+- [mrlesmithjr@gmail.com](mailto:mrlesmithjr@gmail.com)
--   mrlesmithjr [at] gmail.com
+- [http://everythingshouldbevirtual.com](http://everythingshouldbevirtual.com)
-
-[@mrlesmithjr]: https://www.twitter.com/mrlesmithjr
-
-[ansible]: https://www.ansible.com

meta/main.yml

@@ -1,24 +1,28 @@
 ---
 galaxy_info:
   author: Larry Smith Jr.
-  description: Role to manage LVM Groups/Logical Volumes. Can be used to create, extend or resize LVM.
+  description: Ansible role to manage(create, extend, resize) LVM Groups/Logical Volumes.
 
   license: MIT
   min_ansible_version: 1.2
   platforms:
+    - name: fedora
+      versions:
+        - 31
+
     - name: EL
       versions:
-        - 6
+        - all
-        - 7
+    - name: Fedora
+      versions:
+        - all
     - name: Ubuntu
       versions:
-        - precise
+        - all
-        - trusty
     - name: Debian
       versions:
-        - jessie
+        - all
-        - wheezy
-
   galaxy_tags:
     - system
+    - lvm
 dependencies: []

molecule/default/converge.yml

@@ -15,7 +15,7 @@
             filesystem: ext4
             mount: true
             mntp: "/var/lib/mountpoint"
-          - lvname: my_lv2
+          - lvname: my_lw
             size: 20%VG
             opts: "--wipesignatures y"
             mount: true
@@ -23,7 +23,6 @@
             filesystem: xfs
             mntp: "/var/lib/mountpoint2"
     manage_lvm: true
-
   tasks:
     - name: "Include lvm"
       include_role:

molecule/default/molecule.yml

@@ -3,22 +3,34 @@ driver:
   name: vagrant
   provider:
     name: virtualbox
-lint: yamllint . && flake8 && ansible-lint --exclude=meta
+lint: yamllint . && flake8 && ansible-lint
 platforms:
-  - name: Fedora-Molecule-LVM
+  - name: CentOS-Molecule-LVM
-    box: bento/fedora-31
+    box: mrlesmithjr/centos7
-    # box-url: ${platform_root}/packer/bento/builds/fedora-31-x86_64.virtualbox.box
     provider_override_args:
       - "persistent_storage.enabled = true"
-      - "persistent_storage.location = 'molecule-lvm.vdi'"
+      - "persistent_storage.location = 'centos-molecule-lvm.vdi'"
+      - "persistent_storage.size = 100"
+      - "persistent_storage.mount = false"
+      - "persistent_storage.diskdevice = '/dev/sdb'"
+  - name: Fedora-Molecule-LVM
+    box: mrlesmithjr/fedora31
+    provider_override_args:
+      - "persistent_storage.enabled = true"
+      - "persistent_storage.location = 'fedora-molecule-lvm.vdi'"
+      - "persistent_storage.size = 100"
+      - "persistent_storage.mount = false"
+      - "persistent_storage.diskdevice = '/dev/sdb'"
+  - name: Ubuntu-Molecule-LVM
+    box: mrlesmithjr/bionic64
+    provider_override_args:
+      - "persistent_storage.enabled = true"
+      - "persistent_storage.location = 'ubuntu-molecule-lvm.vdi'"
       - "persistent_storage.size = 100"
       - "persistent_storage.mount = false"
       - "persistent_storage.diskdevice = '/dev/sdb'"
 provisioner:
   name: ansible
-  inventory:
-    group_vars:
-      lvm:
 verifier:
   name: testinfra
   env:

molecule/default/tests/test_default.py

@@ -18,6 +18,13 @@ def test_mylv_logical_volume_is_created(host):
     assert int(cmd.stdout.rstrip()) >= 1
 
 
+def test_mylv_logical_volume2_is_created(host):
+    command = """sudo lvs -o lv_name  my_vg --separator='|' --noheadings \
+    | grep -c 'my_lw'"""
+    cmd = host.run(command)
+    assert int(cmd.stdout.rstrip()) >= 1
+
+
 def test_volume_is_mounted(host):
     host.file("/var/lib/mountpoint").mode == 0o731
 

molecule/kvm/converge.yml

@@ -0,0 +1,29 @@
+---
+- name: Converge
+  hosts: all
+  vars:
+    lvm_groups:
+      - vgname: my_vg
+        disks:
+          - /dev/vdb
+        create: true
+        lvnames:
+          - lvname: my_lv
+            size: 40%VG
+            opts: "--wipesignatures y"
+            create: true
+            filesystem: ext4
+            mount: true
+            mntp: "/var/lib/mountpoint"
+          - lvname: my_lw
+            size: 20%VG
+            opts: "--wipesignatures y"
+            mount: true
+            create: true
+            filesystem: xfs
+            mntp: "/var/lib/mountpoint2"
+    manage_lvm: true
+  tasks:
+    - name: "Include lvm"
+      include_role:
+        name: "ansible-manage-lvm"

molecule/kvm/molecule.yml

@@ -0,0 +1,29 @@
+---
+driver:
+  name: vagrant
+  provider:
+    name: libvirt
+lint: yamllint . && flake8 && ansible-lint
+platforms:
+  - name: Fedora-Molecule-Volumes-KVM
+    box: fedora/31-cloud-base
+    cpu: 2
+    memory: 2048
+    provider_raw_config_args:
+      - "storage :file, :size => '1G', :device => 'vdb'"
+provisioner:
+  name: ansible
+  config_options:
+    defaults:
+      forks: 20
+    ssh_connection:
+      pipelining: true
+      ssh_args: -o ControlMaster=auto -o ControlPersist=600s
+verifier:
+  name: testinfra
+  env:
+    PYTHONWARNINGS: "ignore:.*U.*mode is deprecated:DeprecationWarning"
+  options:
+    v: 1
+scenario:
+  name: kvm

molecule/kvm/tests

@@ -0,0 +1 @@
+../default/tests

molecule/kvmonlyvg/converge.yml

@@ -0,0 +1,14 @@
+---
+- name: Converge
+  hosts: all
+  vars:
+    lvm_groups:
+      - vgname: my_vg
+        disks:
+          - /dev/vdb
+        create: true
+    manage_lvm: true
+  tasks:
+    - name: "Include lvm"
+      include_role:
+        name: "ansible-manage-lvm"

molecule/kvmonlyvg/molecule.yml

@@ -0,0 +1,29 @@
+---
+driver:
+  name: vagrant
+  provider:
+    name: libvirt
+lint: yamllint . && flake8 && ansible-lint
+platforms:
+  - name: Fedora-Molecule-Volumes-KVM
+    box: fedora/31-cloud-base
+    cpu: 2
+    memory: 2048
+    provider_raw_config_args:
+      - "storage :file, :size => '1G', :device => 'vdb'"
+provisioner:
+  name: ansible
+  config_options:
+    defaults:
+      forks: 20
+    ssh_connection:
+      pipelining: true
+      ssh_args: -o ControlMaster=auto -o ControlPersist=600s
+verifier:
+  name: testinfra
+  env:
+    PYTHONWARNINGS: "ignore:.*U.*mode is deprecated:DeprecationWarning"
+  options:
+    v: 1
+scenario:
+  name: kvmonlyvg

molecule/kvmonlyvg/tests/conftest.py

@@ -0,0 +1 @@
+../../default/tests/conftest.py

molecule/kvmonlyvg/tests/test_default.py

@@ -0,0 +1,11 @@
+"""Role testing files using testinfra."""
+
+
+def test_lvm_package_shall_be_installed(host):
+    assert host.package("lvm2").is_installed
+
+
+def test_non_persistent_volume_group_is_created(host):
+    command = """sudo vgdisplay | grep -c 'my_vg'"""
+    cmd = host.run(command)
+    assert '1' in cmd.stdout

molecule/kvmsinglelv/converge.yml

@@ -0,0 +1,22 @@
+---
+- name: Converge
+  hosts: all
+  vars:
+    lvm_groups:
+      - vgname: my_vg
+        disks:
+          - /dev/vdb
+        create: true
+        lvnames:
+          - lvname: my_lv
+            size: 40%VG
+            opts: "--wipesignatures y"
+            create: true
+            filesystem: ext4
+            mount: true
+            mntp: "/var/lib/mountpoint"
+    manage_lvm: true
+  tasks:
+    - name: "Include lvm"
+      include_role:
+        name: "ansible-manage-lvm"

molecule/kvmsinglelv/molecule.yml

@@ -0,0 +1,29 @@
+---
+driver:
+  name: vagrant
+  provider:
+    name: libvirt
+lint: yamllint . && flake8 && ansible-lint
+platforms:
+  - name: Fedora-Molecule-Volumes-KVM
+    box: fedora/31-cloud-base
+    cpu: 2
+    memory: 2048
+    provider_raw_config_args:
+      - "storage :file, :size => '1G', :device => 'vdb'"
+provisioner:
+  name: ansible
+  config_options:
+    defaults:
+      forks: 20
+    ssh_connection:
+      pipelining: true
+      ssh_args: -o ControlMaster=auto -o ControlPersist=600s
+verifier:
+  name: testinfra
+  env:
+    PYTHONWARNINGS: "ignore:.*U.*mode is deprecated:DeprecationWarning"
+  options:
+    v: 1
+scenario:
+  name: kvmsinglelv

molecule/kvmsinglelv/tests/conftest.py

@@ -0,0 +1 @@
+../../default/tests/conftest.py

molecule/kvmsinglelv/tests/test_default.py

@@ -0,0 +1,22 @@
+"""Role testing files using testinfra."""
+
+
+def test_lvm_package_shall_be_installed(host):
+    assert host.package("lvm2").is_installed
+
+
+def test_non_persistent_volume_group_is_created(host):
+    command = """sudo vgdisplay | grep -c 'my_vg'"""
+    cmd = host.run(command)
+    assert '1' in cmd.stdout
+
+
+def test_mylv_logical_volume_is_created(host):
+    command = """sudo lvs -o lv_name  my_vg --separator='|' --noheadings \
+    | grep -c 'my_lv'"""
+    cmd = host.run(command)
+    assert int(cmd.stdout.rstrip()) >= 1
+
+
+def test_volume_is_mounted(host):
+    host.file("/var/lib/mountpoint").mode == 0o731

playbook.yml

@@ -0,0 +1,27 @@
+---
+- hosts: test-nodes
+  vars:
+    lvm_groups:
+      - vgname: test-vg
+        disks:
+          - /dev/sdb
+          - /dev/sdc
+        create: true
+        lvnames:
+          - lvname: test_1
+            size: 5g
+            create: true
+            filesystem: ext4
+            mount: true
+            mntp: /mnt/test_1
+          - lvname: test_2
+            size: 10g
+            create: true
+            filesystem: ext4
+            mount: true
+            mntp: /mnt/test_2
+    manage_lvm: true
+  tasks:
+    - name: Include lvm
+      include_role:
+        name: ansible-manage-lvm

setup_travis_tests.sh

@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-TAR_FILE="v1.6.0.tar.gz"
-
-# Prompt for Ansible role name
-read -p "Enter the Ansible role name: " input
-
-# Update .travis.yml with Ansible role name
-sed -i '' "s/replace_role/${input}/g" ".travis.yml"
-
-# Update tests/test.yml with Ansible role name
-sed -i '' "s/replace_role/${input}/g" "tests/test.yml"
-
-# Cleanup
-if [ -f $TAR_FILE ]; then
-  rm $TAR_FILE
-fi

tasks/centos.yml

@@ -1,43 +1,47 @@
 ---
 - name: centos | installing lvm2
   package:
-    name: "lvm2"
+    name: lvm2
-    state: "present"
+    state: present
   become: true
 
 - name: centos | installing sg3_utils
   package:
-    name: "sg3_utils"
+    name: sg3_utils
-    state: "present"
+    state: present
   become: true
 
+- name: centos | debug lvg
+  debug:
+    var: lv
+    verbosity: 3
+  loop: "{{ lookup('subelements', lvm_groups, 'lvnames', {'skip_missing': True}, wantlist=True) }}"
+  loop_control:
+    loop_var: lv
+
 - name: centos | install xfs tools
   package:
     name: "xfsprogs"
     state: "present"
-  become: yes
+  become: true
-  loop: "{{ lvm_groups|subelements('lvnames') }}"
+  loop: "{{ lookup('subelements', lvm_groups, 'lvnames', {'skip_missing': True}, wantlist=True) }}"
-  when: >
+  loop_control:
-    (
+    loop_var: lv
-    (item.1 is defined and item.1 != 'None') and
+  when:
-    (
+    - lv.1 is defined
-    item.1.filesystem is defined and
+    - lv.1 != "None"
-    item.1.filesystem == "xfs"
+    - lv.1.filesystem is defined
-    )
+    - lv.1.filesystem == "xfs"
-    and
+    - lv.1.create is defined
-    (
+    - lv.1.create|bool
-    item.1.create is defined and
-    item.1.create
-    )
-    )
 
 - name: centos | checking for scsi devices
-  command: "sg_scan"
+  command: sg_scan
   become: true
-  register: "scsi_devices"
+  register: scsi_devices
-  changed_when: False
+  changed_when: false
 
 - name: centos | rescanning for new disks
-  command: "/usr/bin/rescan-scsi-bus.sh"
+  command: /usr/bin/rescan-scsi-bus.sh
   become: true
-  changed_when: False
+  changed_when: false

tasks/create_fs.yml

@@ -1,110 +1,96 @@
 ---
-- 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)
+# unable to resize xfs: looks like we've to reference the mountpoint instead of the device
-  filesystem:
+- name: create_fs | check already converted
-    fstype: "{{ lv.filesystem }}"
-    dev: "/dev/{{ vg.vgname }}/{{ lv.lvname }}"
-    resizefs: yes
-  loop: "{{ vg.lvnames }}"
-  loop_control:
-    loop_var: lv
-  become: true
-  when: >
-    (
-    (vg.create is defined and
-    vg.create) and
-    (lv is defined and
-    lv != 'None') and
-    (lv.create is defined and
-    lv.create) and
-    (
-    lv.filesystem is defined and
-    lv.filesystem != 'None' and
-    lv.filesystem != 'xfs'
-    )
-    )
-  # 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 {{ lv.mntp }} | grep -c 'ftype=1'"
   become: yes
-  loop: "{{ vg.lvnames }}"
-  loop_control:
-    loop_var: lv
   register: mountedxfs
-  ignore_errors: True
+  ignore_errors: true
-  changed_when: no
+  changed_when: false
-  when: >
+  when:
-    (
+    - lv is defined and lv != 'None'
-    (lv is defined and lv != 'None') and
+    - lv.filesystem is defined
-    (
+    - lv.filesystem == "xfs"
-    lv.filesystem is defined and
+    - lv.create is defined
-    lv.filesystem == "xfs"
+    - lv.create|bool
-    )
-    and
-    (
-    lv.create is defined and
-    lv.create
-    )
-    )
 
-- name: manage_lvm | creating new xfs filesystem on new LVM logical volume(s)
+- name: create_fs | unmounting filesystem(s)
+  mount:
+    path: "{{ lv.mntp }}"
+    src: "/dev/{{ vg.vgname }}/{{ lv.lvname }}"
+    fstype: "{{ lv.filesystem | default(omit) }}"
+    state: absent
+  become: true
+  when:
+    - lv is defined
+    - lv != 'None'
+    - lv.create is defined
+    - not lv.create|bool
+    - lv.filesystem != "swap"
+
+- name: create_fs | creating new filesystem on new LVM logical volume(s)
   filesystem:
     fstype: "{{ lv.filesystem }}"
     dev: "/dev/{{ vg.vgname }}/{{ lv.lvname }}"
-  loop: "{{ vg.lvnames }}"
+    resizefs: yes
-  loop_control:
-    loop_var: lv
   become: true
-  when: >
+  when:
-    (
+    - vg.create is defined
-    mountedxfs is failed and
+    - vg.create|bool
-    (vg.create is defined and
+    - lv is defined
-    vg.create) and
+    - lv != 'None'
-    (lv is defined and
+    - lv.create is defined
-    lv != 'None') and
+    - lv.create|bool
-    (lv.create is defined and
+    - lv.filesystem is defined
-    lv.create) and
+    - lv.filesystem != 'None'
-    (
+    - lv.filesystem != 'xfs'
-    lv.filesystem is defined and
-    lv.filesystem == 'xfs'
-    )
-    )
 
-- name: manage_lvm | mounting new filesystem(s)
+- name: create_fs | creating new xfs filesystem on new LVM logical volume(s)
+  filesystem:
+    fstype: "{{ lv.filesystem }}"
+    dev: "/dev/{{ vg.vgname }}/{{ lv.lvname }}"
+  become: true
+  when:
+    - mountedxfs is failed
+    - vg.create is defined
+    - vg.create|bool
+    - lv is defined
+    - lv != 'None'
+    - lv.create is defined
+    - lv.create|bool
+    - lv.filesystem is defined
+    - lv.filesystem == 'xfs'
+
+- name: create_fs | mounting new filesystem(s)
   mount:
     path: "{{ lv.mntp }}"
     src: "/dev/{{ vg.vgname }}/{{ lv.lvname }}"
     fstype: "{{ lv.filesystem }}"
-    state: "mounted"
+    state: mounted
     opts: "{{ lv.mopts | default('defaults') }}"
   become: true
-  loop: "{{ vg.lvnames }}"
+  when:
-  loop_control:
+    - vg.create is defined
-    loop_var: lv
+    - vg.create|bool
-  when: >
+    - lv is defined
-    ((vg.create is defined and
+    - lv != 'None'
-    vg.create) and
+    - lv.create is defined
-    lv != 'None' and
+    - lv.create|bool
-    (lv.create is defined and
+    - lv.mount is defined
-    lv.create) and
+    - lv.mount|bool
-    (lv.mount is defined and
+
-    lv.mount))
+- name: create_fs | resizing xfs filesystem on new LVM logical volume(s)
+  command: "xfs_growfs {{ lv.mntp }}"
+  become: true
+  when:
+    - vg.create is defined
+    - vg.create|bool
+    - lv is defined
+    - lv != 'None'
+    - lv.create is defined
+    - lv.create|bool
+    - lv.filesystem is defined
+    - lv.filesystem == 'xfs'
+    - lvchanged.changed

tasks/create_lv.yml

@@ -1,30 +1,31 @@
 ---
-- debug: var=vg
 
-- name: "debug lvm"
+- name: create_lv | Display Volume Group
-  loop: "{{ vg.lvnames }}"
+  debug:
-  debug: var=lv
+    var: vg
-  loop_control:
+    verbosity: 2
-    loop_var: lv
 
-- name: manage_lvm | creating new LVM logical volume(s)
+- name: create_lv | creating new LVM logical volume(s)
   lvol:
     vg: "{{ vg.vgname }}"
     lv: "{{ lv.lvname }}"
     size: "{{ lv.size }}"
-    shrink: no
+    shrink: false
     opts: "{{ lv.opts | default('') }}"
-    state: "present"
+    state: present
-  loop: "{{ vg.lvnames }}"
-  loop_control:
-    loop_var: lv
   become: true
-  when: >
+  register: lvchanged
-    (
+  when:
-    (vg.create is defined
+    - vg.create is defined
-    and vg.create) and
+    - vg.create|bool
-    (lv is defined and
+    - lv is defined
-    lv != 'None') and
+    - lv != 'None'
-    (lv.create is defined and
+    - lv.create is defined
-    lv.create)
+    - lv.create|bool
-    )
+
+- name: create_lv | debug changed attribute
+  debug:
+    var: lvchanged
+
+- name: create_lv | configuring FS
+  include_tasks: create_fs.yml

tasks/create_vg.yml

@@ -1,12 +1,16 @@
 ---
-
+- name: create_vg | creating new LVM volume group(s)
-- name: manage_lvm | creating new LVM volume group(s)
   lvg:
-    vg: "{{ item.vgname }}"
+    vg: "{{ vg.vgname }}"
-    pvs: "{{ item.disks | join(',') }}"
+    pvs: "{{ vg.disks | join(',') }}"
-    state: "present"
+    state: present
   become: true
-  loop: "{{ lvm_groups }}"
+  when:
-  when: >
+    - vg.create is defined
-    item.create is defined and
+    - vg.create|bool
-    item.create
+
+- name: manage_lvm | loop over logical volume group(s) to create logical volumes
+  include_tasks: create_lv.yml
+  loop: "{{ vg.lvnames | default([]) }}"
+  loop_control:
+    loop_var: lv

tasks/debian.yml

@@ -1,40 +1,40 @@
 ---
+- name: debian | Updating Apt Cache
+  apt:
+    update_cache: true
+    cache_valid_time: 3600
+  become: true
+
 - name: debian | installing pre-reqs
-  package:
+  apt:
     name:
       - lvm2
       - scsitools
-    state: "present"
+    state: present
   become: true
 
 - name: debian | install xfs tools
-  package:
+  apt:
-    name: "xfsprogs"
+    name: xfsprogs
-    state: "present"
+    state: present
-  become: yes
+  become: true
   loop: "{{ lvm_groups|subelements('lvnames') }}"
-  when: >
+  when:
-    (
+    - item.1 is defined
-    (item.1 is defined and item.1 != 'None') and
+    - item.1 != 'None'
-    (
+    - item.1.filesystem is defined
-    item.1.filesystem is defined and
+    - item.1.filesystem == "xfs"
-    item.1.filesystem == "xfs"
+    - item.1.create is defined
-    )
+    - item.1.create|bool
-    and
-    (
-    item.1.create is defined and
-    item.1.create
-    )
-    )
 
 - name: debian | checking for scsi devices
-  command: "sg_scan"
+  command: sg_scan
   become: true
-  register: "scsi_devices"
+  register: scsi_devices
   changed_when: false
 
 - name: debian | rescanning for new disks added
-  command: "/sbin/rescan-scsi-bus"
+  command: /sbin/rescan-scsi-bus
   become: true
   changed_when: false
   when: scsi_devices['stdout'] | length

tasks/main.yml

@@ -7,6 +7,6 @@
   when: ansible_os_family == "RedHat"
 
 - include_tasks: manage_lvm.yml
-  when: >
+  when:
-    manage_lvm and
+    - lvm_groups is defined
-    lvm_groups is defined
+    - manage_lvm|bool

tasks/manage_lvm.yml

@@ -1,15 +1,6 @@
 ---
 - name: manage_lvm | manage physical volume group creation
   include_tasks: create_vg.yml
-
-- name: manage_lvm | loop over logical volume group(s) to create logical volumes
-  include_tasks: create_lv.yml
-  loop: "{{ lvm_groups }}"
-  loop_control:
-    loop_var: vg
-
-- name: manage_lvm | loop over logical volume group(s) to create filesystems
-  include_tasks: create_fs.yml
   loop: "{{ lvm_groups }}"
   loop_control:
     loop_var: vg
@@ -18,23 +9,23 @@
   lvol:
     vg: "{{ item.0.vgname }}"
     lv: "{{ item.1.lvname }}"
-    state: "absent"
+    state: absent
-    force: yes
+    force: true
   become: true
-  loop: "{{ lvm_groups|subelements('lvnames') }}"
+  loop: "{{ lvm_groups|subelements('lvnames', {'skip_missing': true}) }}"
-  when: >
+  when:
-    (item.1 is defined and
+    - item.1 is defined
-    item.1 != 'None') and
+    - item.1 != 'None'
-    (item.1.create is defined and
+    - item.1.create is defined
-    not item.1.create)
+    - not item.1.create|bool
 
 - name: manage_lvm | Removing LVM volume group(s)
   lvg:
     vg: "{{ item.vgname }}"
     pvs: "{{ item.disks | join(',') }}"
-    state: "absent"
+    state: absent
   become: true
   loop: "{{ lvm_groups }}"
-  when: >
+  when:
-    item.create is defined and
+    - item.create is defined
-    not item.create
+    - not item.create|bool