Merge pull request #18 from mrlesmithjr/fix-travis-testing

Fix travis testing

.travis.yml

@@ -0,0 +1,61 @@
+---
+language: python
+python: "2.7"
+
+# Use the new container infrastructure
+sudo: required
+
+services:
+  - docker
+
+env:
+  - distribution: centos
+    init: /usr/lib/systemd/systemd
+    version: 7
+  - distribution: fedora
+    init: /usr/lib/systemd/systemd
+    version: 26
+  - distribution: fedora
+    init: /usr/lib/systemd/systemd
+    version: 25
+  - distribution: fedora
+    init: /usr/lib/systemd/systemd
+    version: 24
+  - distribution: ubuntu
+    init: /lib/systemd/systemd
+    version: bionic
+  - distribution: ubuntu
+    init: /lib/systemd/systemd
+    version: xenial
+  - distribution: ubuntu
+    init: /sbin/init
+    version: trusty
+  - distribution: debian
+    init: /lib/systemd/systemd
+    version: stretch
+  - distribution: debian
+    init: /lib/systemd/systemd
+    version: jessie
+
+before_install:
+  - 'sudo pip install yamllint'
+  - yamllint -c .yamllint.yml .
+  - 'sudo docker pull ${distribution}:${version}'
+  - 'sudo docker build --no-cache --rm --file=tests/Dockerfile.${distribution}-${version} --tag=${distribution}-${version}:ansible tests'
+
+script:
+  - container_id=$(mktemp)
+  - role_name="ansible-manage-lvm"
+  - 'sudo docker run --detach --privileged -v /sys/fs/cgroup:/sys/fs/cgroup:ro --volume="${PWD}":/etc/ansible/roles/${role_name}:ro ${distribution}-${version}:ansible ${init} > "${container_id}"'
+  - 'sudo docker exec "$(cat ${container_id})" env ANSIBLE_FORCE_COLOR=1 ansible-lint -c /.ansible-lint /etc/ansible/roles/${role_name}/tests/test.yml'
+  - 'sudo docker exec "$(cat ${container_id})" env ANSIBLE_FORCE_COLOR=1 ansible-playbook -v /etc/ansible/roles/${role_name}/tests/test.yml --syntax-check'
+  - 'sudo docker exec "$(cat ${container_id})" env ANSIBLE_FORCE_COLOR=1 ansible-playbook -v /etc/ansible/roles/${role_name}/tests/test.yml'
+  - >
+      sudo docker exec "$(cat ${container_id})" env ANSIBLE_FORCE_COLOR=1 ansible-playbook -v /etc/ansible/roles/${role_name}/tests/test.yml
+      | grep -q 'changed=0.*failed=0'
+      && (echo 'Idempotence test: pass' && exit 0)
+      || (echo 'Idempotence test: fail' && exit 1)
+  - 'sudo docker rm -f "$(cat ${container_id})"'
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/

.yamllint.yml

@@ -0,0 +1,58 @@
+---
+extends:                    default
+
+rules:
+  braces:
+    # Defaults
+    # min-spaces-inside:    0
+    # max-spaces-inside:    0
+
+    # Keeping 0 min-spaces to not error on empty collection definitions
+    min-spaces-inside:      0
+    # Allowing one space inside braces to improve code readability
+    max-spaces-inside:      1
+
+  brackets:
+    # Defaults
+    # min-spaces-inside:    0
+    # max-spaces-inside:    0
+
+    # Keeping 0 min-spaces to not error on empty collection definitions
+    min-spaces-inside:      0
+    # Allowing one space inside braces to improve code readability
+    max-spaces-inside:      1
+
+  colons:
+    # Defaults
+    # max-spaces-before:    0
+    # max-spaces-after:     1
+
+    max-spaces-before:      0
+    # Allowing more than one space for code readability
+    max-spaces-after:       -1
+
+  comments:
+    # Defaults
+    # level:                warning
+    # require-starting-space: true
+    # min-spaces-from-content: 2
+
+    # Disabling to allow for code comment blocks and #!/usr/bin/ansible-playbook
+    require-starting-space: false
+
+  indentation:
+    # Defaults
+    # spaces:               consistent
+    # indent-sequences:     true
+    # check-multi-line-strings: false
+
+    # Requiring 2 space indentation
+    spaces:                 2
+    # Requiring consistent indentation within a file, either indented or not
+    indent-sequences:       consistent
+
+  # Disabling due to copious amounts of long lines in the code which would
+  # require a code style change to resolve
+  line-length:              disable
+
+  truthy:                   disable

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

meta/main.yml

@@ -2,36 +2,23 @@
 galaxy_info:
   author: Larry Smith Jr.
   description: Role to manage LVM Groups/Logical Volumes. Can be used to create, extend or resize LVM.
-  #company: your company (optional)
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-  # Some suggested licenses:
-  # - BSD (default)
-  # - MIT
-  # - GPLv2
-  # - GPLv3
-  # - Apache
-  # - CC-BY
+
   license: license (GPLv2, CC-BY, etc)
   min_ansible_version: 1.2
   platforms:
   - name: EL
     versions:
-      - 6
-      - 7
+    - 6
+    - 7
   - name: Ubuntu
     versions:
-      - precise
-      - trusty
+    - precise
+    - trusty
   - name: Debian
     versions:
-      - jessie
-      - wheezy
+    - jessie
+    - wheezy
 
   categories:
   - system
 dependencies: []
-  # List your role dependencies here, one per line.
-  # Be sure to remove the '[]' above if you add dependencies
-  # to this list.

setup_travis_tests.sh

@@ -0,0 +1,17 @@
+#!/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/debian.yml

@@ -5,9 +5,9 @@
     state: "present"
   become: true
   with_items:
-     - 'lvm2'
-     - 'scsitools'
-     - 'xfsprogs'
+  - lvm2
+  - scsitools
+  - xfsprogs
 
 - name: debian | checking for scsi devices
   shell: "sg_scan"

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
@@ -34,7 +35,7 @@
   filesystem:
     fstype: "{{ item[1]['filesystem'] }}"
     dev: "/dev/{{ item[0]['vgname'] }}/{{ item[1]['lvname'] }}"
-#    resizefs: yes  #coming in 2.0 which will replace the resizing filesystem task below
+    # resizefs: yes  #coming in 2.0 which will replace the resizing filesystem task below
   become: true
   with_subelements:
     - "{{ lvm_groups }}"
@@ -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:

tests/.ansible-lint

@@ -0,0 +1 @@
+skip_list: ['305','503']

tests/Dockerfile.centos-7

@@ -0,0 +1,27 @@
+FROM centos:7
+ENV container=docker
+
+RUN yum -y install epel-release && \
+    yum -y install gmp-devel libffi-devel openssl-devel python-crypto \
+    python-devel python-pip python-setuptools python-virtualenv \
+    redhat-rpm-config && \
+    yum -y group install "Development Tools"
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+    rm -f /lib/systemd/system/multi-user.target.wants/*;\
+    rm -f /etc/systemd/system/*.wants/*;\
+    rm -f /lib/systemd/system/local-fs.target.wants/*; \
+    rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+    rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+    rm -f /lib/systemd/system/basic.target.wants/*;\
+    rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+RUN pip install enum34 ipaddress wheel && \
+    pip install ansible ansible-lint
+
+COPY .ansible-lint /
+
+VOLUME ["/sys/fs/cgroup"]
+
+CMD ["/usr/sbin/init"]

tests/Dockerfile.debian-jessie

@@ -0,0 +1,14 @@
+FROM debian:jessie
+ENV container=docker
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends build-essential libffi-dev \
+    libssl-dev python-dev python-minimal python-pip python-setuptools \
+    python-virtualenv && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN pip install --upgrade pip setuptools && \
+    pip install enum34 ipaddress wheel && \
+    pip install ansible ansible-lint
+
+COPY .ansible-lint /

tests/Dockerfile.debian-stretch

@@ -0,0 +1,13 @@
+FROM debian:stretch
+ENV container=docker
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends build-essential libffi-dev \
+    libssl-dev python-dev python-minimal python-pip python-setuptools \
+    python-virtualenv systemd && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN pip install enum34 ipaddress wheel && \
+    pip install ansible ansible-lint
+
+COPY .ansible-lint /

tests/Dockerfile.fedora-24

@@ -0,0 +1,26 @@
+FROM fedora:24
+ENV container=docker
+
+RUN dnf -y install gmp-devel libffi-devel openssl-devel python-crypto \
+    python-devel python-dnf python-pip python-setuptools python-virtualenv \
+    redhat-rpm-config systemd && \
+    dnf -y group install "C Development Tools and Libraries"
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+    rm -f /lib/systemd/system/multi-user.target.wants/*;\
+    rm -f /etc/systemd/system/*.wants/*;\
+    rm -f /lib/systemd/system/local-fs.target.wants/*; \
+    rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+    rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+    rm -f /lib/systemd/system/basic.target.wants/*;\
+    rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+RUN pip install enum34 ipaddress wheel && \
+    pip install ansible ansible-lint
+
+COPY .ansible-lint /
+
+VOLUME ["/sys/fs/cgroup"]
+
+CMD ["/usr/sbin/init"]

tests/Dockerfile.fedora-25

@@ -0,0 +1,26 @@
+FROM fedora:25
+ENV container=docker
+
+RUN dnf -y install gmp-devel libffi-devel openssl-devel python-crypto \
+    python-devel python-dnf python-pip python-setuptools python-virtualenv \
+    redhat-rpm-config systemd && \
+    dnf -y group install "C Development Tools and Libraries"
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+    rm -f /lib/systemd/system/multi-user.target.wants/*;\
+    rm -f /etc/systemd/system/*.wants/*;\
+    rm -f /lib/systemd/system/local-fs.target.wants/*; \
+    rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+    rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+    rm -f /lib/systemd/system/basic.target.wants/*;\
+    rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+RUN pip install enum34 ipaddress wheel && \
+    pip install ansible ansible-lint
+
+COPY .ansible-lint /
+
+VOLUME ["/sys/fs/cgroup"]
+
+CMD ["/usr/sbin/init"]

tests/Dockerfile.fedora-26

@@ -0,0 +1,26 @@
+FROM fedora:26
+ENV container=docker
+
+RUN dnf -y install gmp-devel libffi-devel openssl-devel python-crypto \
+    python-devel python-dnf python-pip python-setuptools python-virtualenv \
+    redhat-rpm-config systemd && \
+    dnf -y group install "C Development Tools and Libraries"
+
+# Install systemd -- See https://hub.docker.com/_/centos/
+RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+    rm -f /lib/systemd/system/multi-user.target.wants/*;\
+    rm -f /etc/systemd/system/*.wants/*;\
+    rm -f /lib/systemd/system/local-fs.target.wants/*; \
+    rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+    rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+    rm -f /lib/systemd/system/basic.target.wants/*;\
+    rm -f /lib/systemd/system/anaconda.target.wants/*;
+
+RUN pip install enum34 ipaddress wheel && \
+    pip install ansible ansible-lint
+
+COPY .ansible-lint /
+
+VOLUME ["/sys/fs/cgroup"]
+
+CMD ["/usr/sbin/init"]

tests/Dockerfile.ubuntu-bionic

@@ -0,0 +1,13 @@
+FROM ubuntu:bionic
+ENV container=docker
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends build-essential libffi-dev \
+    libssl-dev python-dev python-minimal python-pip python-setuptools \
+    python-virtualenv systemd && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN pip install enum34 ipaddress wheel && \
+    pip install ansible ansible-lint
+
+COPY .ansible-lint /

tests/Dockerfile.ubuntu-trusty

@@ -0,0 +1,14 @@
+FROM ubuntu:trusty
+ENV container=docker
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends build-essential libffi-dev \
+    libssl-dev python-dev python-minimal python-pip python-setuptools \
+    python-virtualenv && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN pip install --upgrade pip setuptools && \
+    pip install enum34 ipaddress wheel && \
+    pip install ansible ansible-lint
+
+COPY .ansible-lint /

tests/Dockerfile.ubuntu-xenial

@@ -0,0 +1,13 @@
+FROM ubuntu:xenial
+ENV container=docker
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends build-essential libffi-dev \
+    libssl-dev python-dev python-minimal python-pip python-setuptools \
+    python-virtualenv && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN pip install enum34 ipaddress wheel && \
+    pip install ansible ansible-lint
+
+COPY .ansible-lint /

tests/inventory

@@ -0,0 +1 @@
+localhost

tests/test.yml

@@ -0,0 +1,5 @@
+---
+- hosts:      localhost
+  connection: local
+  roles:
+    - ansible-manage-lvm