Restructure the molecule testing to match the playbook structure

4 files changed, 69 insertions, 23 deletions

diff --git a/molecule/archlinux/converge.yml b/molecule/archlinux/converge.yml
index 70af5253..766ae51f 100644
--- a/molecule/archlinux/converge.yml
+++ b/molecule/archlinux/converge.yml
@@ -1,6 +1,6 @@
 ---
-- name: Converge
-  hosts: archlinux
+- name: "Bootstrap"
+  hosts: "archlinux"
   gather_facts: true
   environment:
     PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
@@ -10,6 +10,20 @@
       - "ssh-ed25519 AAAA...fMo"
       - "ssh-rsa AAAA...4I3"
     user_groups: ["wheel", "test_group"]
+  roles:
+    - role: "hostname"
+    - role: "network"
+    - role: "user"
+    - role: "ssh"
+    - role: "password_policy"
+
+- name: "Configure"
+  hosts: "archlinux"
+  gather_facts: true
+  environment:
+    PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
+  vars:
+    ansible_become_method: su
     locales:
       - "en_US.UTF-8 UTF-8"
     timezone: "GMT"
@@ -24,11 +38,6 @@
     firefox_install_browserpass: true
     firefox_install_passff: true
   roles:
-    - role: "hostname"
-    - role: "network"
-    - role: "user"
-    - role: "ssh"
-    - role: "password_policy"
     - role: "locales"
     - role: "timezone"
     - role: "jq"
diff --git a/molecule/debian/converge.yml b/molecule/debian/converge.yml
index d20932fc..7d06f734 100644
--- a/molecule/debian/converge.yml
+++ b/molecule/debian/converge.yml
@@ -1,6 +1,6 @@
 ---
-- name: Converge
-  hosts: debian
+- name: "Bootstrap"
+  hosts: "debian"
   gather_facts: true
   environment:
     PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
@@ -10,6 +10,20 @@
       - "ssh-ed25519 AAAA...fMo"
       - "ssh-rsa AAAA...4I3"
     user_groups: ["wheel", "test_group"]
+  roles:
+    - role: "hostname"
+    - role: "network"
+    - role: "user"
+    - role: "ssh"
+    - role: "password_policy"
+
+- name: "Configure"
+  hosts: "debian"
+  gather_facts: true
+  environment:
+    PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
+  vars:
+    ansible_become_method: su
     locales:
       - "en_US.UTF-8 UTF-8"
     timezone: "GMT"
@@ -35,11 +49,6 @@
     firefox_install_browserpass: true
     firefox_install_passff: true
   roles:
-    - role: "hostname"
-    - role: "network"
-    - role: "user"
-    - role: "ssh"
-    - role: "password_policy"
     - role: "locales"
     - role: "timezone"
     - role: "jq"
diff --git a/molecule/raspberrypi/converge.yml b/molecule/raspberrypi/converge.yml
index 0cbd9f6d..354a621d 100644
--- a/molecule/raspberrypi/converge.yml
+++ b/molecule/raspberrypi/converge.yml
@@ -1,10 +1,29 @@
 ---
-- name: Converge
-  hosts: raspberrypi
+- name: "Bootstrap"
+  hosts: "raspberrypi"
   gather_facts: true
+  environment:
+    PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
   vars:
     ansible_become_method: su
+    user_public_keys:
+      - "ssh-ed25519 AAAA...fMo"
+      - "ssh-rsa AAAA...4I3"
     user_groups: ["wheel", "test_group"]
+  roles:
+    - role: "hostname"
+    - role: "network"
+    - role: "user"
+    - role: "ssh"
+    - role: "password_policy"
+
+- name: "Configure"
+  hosts: "raspberrypi"
+  gather_facts: true
+  environment:
+    PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
+  vars:
+    ansible_become_method: su
     locales:
       - "en_US.UTF-8 UTF-8"
     timezone: "GMT"
diff --git a/molecule/ubuntu/converge.yml b/molecule/ubuntu/converge.yml
index 73f8268a..25b2a186 100644
--- a/molecule/ubuntu/converge.yml
+++ b/molecule/ubuntu/converge.yml
@@ -1,6 +1,6 @@
 ---
-- name: Converge
-  hosts: ubuntu
+- name: "Bootstrap"
+  hosts: "ubuntu"
   gather_facts: true
   environment:
     PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
@@ -10,6 +10,20 @@
       - "ssh-ed25519 AAAA...fMo"
       - "ssh-rsa AAAA...4I3"
     user_groups: ["wheel", "test_group"]
+  roles:
+    - role: "hostname"
+    - role: "network"
+    - role: "user"
+    - role: "ssh"
+    - role: "password_policy"
+
+- name: "Configure"
+  hosts: "ubuntu"
+  gather_facts: true
+  environment:
+    PATH: "{{ ansible_env.HOME }}/.local/bin:{{ ansible_env.PATH }}"
+  vars:
+    ansible_become_method: su
     locales:
       - "en_US.UTF-8 UTF-8"
     timezone: "GMT"
@@ -24,11 +38,6 @@
     firefox_install_browserpass: true
     firefox_install_passff: true
   roles:
-    - role: "hostname"
-    - role: "network"
-    - role: "user"
-    - role: "ssh"
-    - role: "password_policy"
     - role: "locales"
     - role: "timezone"
     - role: "jq"