Use templated molecule scenarios, remove complexity.

robertdebock · Mar 17, 2019 · 31def50 · 31def50
1 parent 4bf038b
commit 31def50
Show file tree

Hide file tree

Showing 51 changed files with 104 additions and 255 deletions.
diff --git a/README.md b/README.md
@@ -13,12 +13,23 @@ This example is taken from `molecule/default/playbook.yml`:
 ---
 - name: Converge
   hosts: all
-  gather_facts: false
-  become: true
+  become: yes
+  gather_facts: yes
+
+  roles:
+    - robertdebock.apt_autostart
+```
+
+The machine you are running this on, may need to be prepared. Tests have been done on machines prepared by this playbook:
+```yaml
+---
+- name: Prepare
+  hosts: all
+  gather_facts: no
+  become: yes
 
   roles:
     - role: robertdebock.bootstrap
-    - role: robertdebock.apt_autostart
 ```
 
 Also see a [full explanation and example](https://robertdebock.nl/how-to-use-these-roles.html) on how to use these roles.

diff --git a/molecule/alpine-edge/Dockerfile.j2 b/molecule/alpine-edge/Dockerfile.j2
diff --git a/molecule/alpine-edge/molecule.yml b/molecule/alpine-edge/molecule.yml
@@ -10,9 +10,13 @@ driver:
 platforms:
   - name: apt_autostart-alpine-edge
     image: alpine:edge
+    pre_build_image: yes
     command: sh -c "while true ; do sleep 1 ; done"
 provisioner:
   name: ansible
+  playbooks:
+    prepare: ../resources/prepare.yml
+    converge: ../resources/playbook.yml
   lint:
     name: ansible-lint
 scenario:

diff --git a/molecule/alpine-edge/playbook.yml b/molecule/alpine-edge/playbook.yml
diff --git a/molecule/alpine-latest/Dockerfile.j2 b/molecule/alpine-latest/Dockerfile.j2
diff --git a/molecule/alpine-latest/molecule.yml b/molecule/alpine-latest/molecule.yml
@@ -10,9 +10,13 @@ driver:
 platforms:
   - name: apt_autostart-alpine-latest
     image: alpine:latest
+    pre_build_image: yes
     command: sh -c "while true ; do sleep 1 ; done"
 provisioner:
   name: ansible
+  playbooks:
+    prepare: ../resources/prepare.yml
+    converge: ../resources/playbook.yml
   lint:
     name: ansible-lint
 scenario:

diff --git a/molecule/alpine-latest/playbook.yml b/molecule/alpine-latest/playbook.yml
diff --git a/molecule/archlinux/Dockerfile.j2 b/molecule/archlinux/Dockerfile.j2
diff --git a/molecule/archlinux/molecule.yml b/molecule/archlinux/molecule.yml
@@ -10,8 +10,12 @@ driver:
 platforms:
   - name: apt_autostart-archlinux
     image: archlinux/base
+    pre_build_image: yes
 provisioner:
   name: ansible
+  playbooks:
+    prepare: ../resources/prepare.yml
+    converge: ../resources/playbook.yml
   lint:
     name: ansible-lint
 scenario:

diff --git a/molecule/archlinux/playbook.yml b/molecule/archlinux/playbook.yml
diff --git a/molecule/centos-6/Dockerfile.j2 b/molecule/centos-6/Dockerfile.j2
diff --git a/molecule/centos-6/molecule.yml b/molecule/centos-6/molecule.yml
@@ -10,8 +10,12 @@ driver:
 platforms:
   - name: apt_autostart-centos-6
     image: centos:6
+    pre_build_image: yes
 provisioner:
   name: ansible
+  playbooks:
+    prepare: ../resources/prepare.yml
+    converge: ../resources/playbook.yml
   lint:
     name: ansible-lint
 scenario:

diff --git a/molecule/centos-6/playbook.yml b/molecule/centos-6/playbook.yml
diff --git a/molecule/centos-latest/Dockerfile.j2 b/molecule/centos-latest/Dockerfile.j2
diff --git a/molecule/centos-latest/molecule.yml b/molecule/centos-latest/molecule.yml
@@ -10,8 +10,12 @@ driver:
 platforms:
   - name: apt_autostart-centos-latest
     image: centos:latest
+    pre_build_image: yes
 provisioner:
   name: ansible
+  playbooks:
+    prepare: ../resources/prepare.yml
+    converge: ../resources/playbook.yml
   lint:
     name: ansible-lint
 scenario:

diff --git a/molecule/centos-latest/playbook.yml b/molecule/centos-latest/playbook.yml
diff --git a/molecule/debian-latest/Dockerfile.j2 b/molecule/debian-latest/Dockerfile.j2
diff --git a/molecule/debian-latest/molecule.yml b/molecule/debian-latest/molecule.yml
@@ -10,8 +10,12 @@ driver:
 platforms:
   - name: apt_autostart-debian-latest
     image: debian:latest
+    pre_build_image: yes
 provisioner:
   name: ansible
+  playbooks:
+    prepare: ../resources/prepare.yml
+    converge: ../resources/playbook.yml
   lint:
     name: ansible-lint
 scenario:

diff --git a/molecule/debian-latest/playbook.yml b/molecule/debian-latest/playbook.yml
diff --git a/molecule/debian-stable/Dockerfile.j2 b/molecule/debian-stable/Dockerfile.j2
diff --git a/molecule/debian-stable/molecule.yml b/molecule/debian-stable/molecule.yml
@@ -10,8 +10,12 @@ driver:
 platforms:
   - name: apt_autostart-debian-stable
     image: debian:stable
+    pre_build_image: yes
 provisioner:
   name: ansible
+  playbooks:
+    prepare: ../resources/prepare.yml
+    converge: ../resources/playbook.yml
   lint:
     name: ansible-lint
 scenario:

diff --git a/molecule/debian-stable/playbook.yml b/molecule/debian-stable/playbook.yml
diff --git a/molecule/debian-unstable/Dockerfile.j2 b/molecule/debian-unstable/Dockerfile.j2
diff --git a/molecule/debian-unstable/molecule.yml b/molecule/debian-unstable/molecule.yml
@@ -10,8 +10,12 @@ driver:
 platforms:
   - name: apt_autostart-debian-unstable
     image: debian:unstable
+    pre_build_image: yes
 provisioner:
   name: ansible
+  playbooks:
+    prepare: ../resources/prepare.yml
+    converge: ../resources/playbook.yml
   lint:
     name: ansible-lint
 scenario:

diff --git a/molecule/debian-unstable/playbook.yml b/molecule/debian-unstable/playbook.yml
diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -10,38 +10,56 @@ driver:
 platforms:
   - name: apt_autostart-alpine-edge
     image: alpine:edge
+    pre_build_image: yes
     command: sh -c "while true ; do sleep 1 ; done"
   - name: apt_autostart-alpine-latest
     image: alpine:latest
+    pre_build_image: yes
     command: sh -c "while true ; do sleep 1 ; done"
   - name: apt_autostart-archlinux
     image: archlinux/base
+    pre_build_image: yes
   - name: apt_autostart-centos-6
     image: centos:6
+    pre_build_image: yes
   - name: apt_autostart-centos-latest
     image: centos:latest
+    pre_build_image: yes
   - name: apt_autostart-debian-latest
     image: debian:latest
+    pre_build_image: yes
   - name: apt_autostart-debian-stable
     image: debian:stable
+    pre_build_image: yes
   - name: apt_autostart-debian-unstable
     image: debian:unstable
+    pre_build_image: yes
   - name: apt_autostart-fedora-latest
     image: fedora:latest
+    pre_build_image: yes
   - name: apt_autostart-fedora-rawhide
     image: fedora:rawhide
+    pre_build_image: yes
   - name: apt_autostart-opensuse-leap
     image: opensuse:leap
+    pre_build_image: yes
   - name: apt_autostart-ubuntu-latest
     image: ubuntu:latest
+    pre_build_image: yes
   - name: apt_autostart-ubuntu-rolling
     image: ubuntu:rolling
+    pre_build_image: yes
   - name: apt_autostart-ubuntu-devel
     image: ubuntu:devel
+    pre_build_image: yes
   - name: apt_autostart-ubuntu-latest
     image: ubuntu:latest
+    pre_build_image: yes
 provisioner:
   name: ansible
+  playbooks:
+    prepare: ../resources/prepare.yml
+    converge: ../resources/playbook.yml
   lint:
     name: ansible-lint
 scenario:

diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
diff --git a/molecule/ec2/molecule.yml b/molecule/ec2/molecule.yml
@@ -34,6 +34,9 @@ platforms:
     vpc_subnet_id: subnet-0e688067
 provisioner:
   name: ansible
+  playbooks:
+    prepare: ../resources/prepare.yml
+    converge: ../resources/playbook.yml
   lint:
     name: ansible-lint
   inventory:

diff --git a/molecule/ec2/playbook.yml b/molecule/ec2/playbook.yml
diff --git a/molecule/fedora-latest/Dockerfile.j2 b/molecule/fedora-latest/Dockerfile.j2