Add/modify/remove files, make the skeleton specific to Ansible roles

Author: jsf9k

.pre-commit-config.yaml

@@ -54,7 +54,7 @@ repos:
     rev: v4.1.0a0
     hooks:
       - id: ansible-lint
-        # files: molecule/default/playbook.yml
+        files: molecule/default/playbook.yml
   - repo: https://github.com/antonbabenko/pre-commit-terraform.git
     rev: v1.11.0
     hooks:

.travis.yml

@@ -8,3 +8,4 @@ install:
   - pip install --upgrade -r requirements-test.txt
 script:
   - pre-commit run --all-files
+  - molecule test

CONTRIBUTING.md

@@ -15,8 +15,8 @@ Before contributing, we encourage you to read our CONTRIBUTING policy
 
 If you want to report a bug or request a new feature, the most direct
 method is to [create an
-issue](https://github.com/cisagov/skeleton-generic/issues) in this
-repository.  We recommend that you first search through existing
+issue](https://github.com/cisagov/skeleton-ansible-role/issues) in
+this repository.  We recommend that you first search through existing
 issues (both open and closed) to check if your particular issue has
 already been reported.  If it has then you might want to add a comment
 to the existing issue.  If it hasn't then feel free to create a new
@@ -25,8 +25,8 @@ one.
 ## Pull requests ##
 
 If you choose to [submit a pull
-request](https://github.com/cisagov/skeleton-generic/pulls), you will
-notice that our continuous integration (CI) system runs a fairly
+request](https://github.com/cisagov/skeleton-ansible-role/pulls), you
+will notice that our continuous integration (CI) system runs a fairly
 extensive set of linters and syntax checkers.  Your pull request may
 fail these checks, and that's OK.  If you want you can stop there and
 wait for us to make the necessary corrections to ensure your code
@@ -79,9 +79,9 @@ can create and configure the Python virtual environment with these
 commands:
 
 ```bash
-cd skeleton-generic
-pyenv virtualenv <python_version_to_use> skeleton-generic
-pyenv local skeleton-generic
+cd skeleton-ansible-role
+pyenv virtualenv <python_version_to_use> skeleton-ansible-role
+pyenv local skeleton-ansible-role
 pip install -r requirements-dev.txt
 ```
 

README.md

@@ -1,16 +1,38 @@
-# skeleton-generic #
+# skeleton-ansible-role #
 
-[![Build Status](https://travis-ci.com/cisagov/skeleton-generic.svg?branch=develop)](https://travis-ci.com/cisagov/skeleton-generic)
+[![Build Status](https://travis-ci.com/cisagov/skeleton-ansible-role.svg?branch=develop)](https://travis-ci.com/cisagov/skeleton-ansible-role)
 
-This is a generic skeleton project that can be used to quickly get a
-new [cisagov](https://github.com/cisagov) GitHub project started.
-This skeleton project contains [licensing information](LICENSE.md), as
-well as [pre-commit hooks](https://pre-commit.com) and a [Travis
-CI](https://travis-ci.com) configuration appropriate for the major
-languages that we use.
+This is a skeleton project that can be used to quickly get a new
+[cisagov](https://github.com/cisagov) Ansible role GitHub project
+started.  This skeleton project contains [licensing
+information](LICENSE.md), as well as [pre-commit
+hooks](https://pre-commit.com) and a [Travis
+CI](https://travis-ci.com) configuration appropriate for an Ansible
+role.
 
-In many cases you will instead want to use one of the more specific
-skeleton projects derived from this one.
+## Requirements ##
+
+None.
+
+## Role Variables ##
+
+None.
+
+## Dependencies ##
+
+None.
+
+## Example Playbook ##
+
+Here's how to use it in a playbook:
+
+```yaml
+- hosts: all
+  become: yes
+  become_method: sudo
+  roles:
+    - skeleton
+```
 
 ## Contributing ##
 
@@ -29,3 +51,7 @@ dedication](https://creativecommons.org/publicdomain/zero/1.0/).
 All contributions to this project will be released under the CC0
 dedication. By submitting a pull request, you are agreeing to comply
 with this waiver of copyright interest.
+
+## Author Information ##
+
+First Last - <[email protected]>

meta/main.yml

@@ -0,0 +1,18 @@
+---
+galaxy_info:
+  author: First Last
+  description: Skeleton Ansible role
+  company: CISA NCATS
+  license: CC0
+  min_ansible_version: 2.0
+  platforms:
+    - name: Debian
+      versions:
+        - stretch
+    - name: Amazon
+      versions:
+        - 2018.03
+  galaxy_tags:
+    - skeleton
+
+dependencies: []

molecule/default/Dockerfile.j2

@@ -0,0 +1,14 @@
+# Molecule managed
+
+{% if item.registry is defined %}
+FROM {{ item.registry.url }}/{{ item.image }}
+{% else %}
+FROM {{ item.image }}
+{% endif %}
+
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python2-dnf bash && dnf clean all; \
+    elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
+    elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
+    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
+    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi

molecule/default/INSTALL.rst

@@ -0,0 +1,16 @@
+*******
+Docker driver installation guide
+*******
+
+Requirements
+============
+
+* General molecule dependencies (see https://molecule.readthedocs.io/en/latest/installation.html)
+* Docker Engine
+* docker-py
+* docker
+
+Install
+=======
+
+    $ sudo pip install docker-py

molecule/default/molecule.yml

@@ -0,0 +1,22 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: docker
+lint:
+  name: yamllint
+platforms:
+  - name: debian9
+    image: debian:stretch-slim
+  - name: amazon2018.03
+    image: amazonlinux:2018.03
+provisioner:
+  name: ansible
+  lint:
+    name: ansible-lint
+scenario:
+  name: default
+verifier:
+  name: testinfra
+  lint:
+    name: flake8

molecule/default/playbook.yml

@@ -0,0 +1,5 @@
+---
+- name: Converge
+  hosts: all
+  roles:
+    - role: skeleton-role

molecule/default/tests/test_default.py

@@ -0,0 +1,13 @@
+import os
+import pytest
+
+import testinfra.utils.ansible_runner
+
+testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+    os.environ["MOLECULE_INVENTORY_FILE"]
+).get_hosts("all")
+
+
+@pytest.mark.parametrize("x", [True])
+def test_packages(host, x):
+    assert x

requirements-test.txt

@@ -1,3 +1,5 @@
 black
+docker # Needed for molecule to work correctly
+molecule
 pre-commit
 pyupgrade

tasks/main.yml

@@ -0,0 +1,2 @@
+---
+# tasks file for skeleton