.ansible-lint.yml

@@ -1,5 +1,5 @@
 ---
 skip_list:
   - fqcn-builtins
-  - experimental
   - no-jinja-nesting
+  - experimental

molecule/default/converge.yml

@@ -8,10 +8,6 @@
     - new_hetzner_server_image: debian-10
     - new_hetzner_delete_protection: false
     - new_hetzner_rebuild_protection: false
-    - members: files/members.yml
-  pre_tasks:
-    - name: Include resource variables
-      include_vars: "{{ members }}"
   tasks:
     - name: Run the role under test
       block:

molecule/default/files/members.yml

@@ -1,6 +0,0 @@
----
-members:
-  - username: foobar
-    email: barfoo
-    ssh_key: "ssh-rsa foo bar@nowhere.com"
-    uid: 1100

molecule/default/requirements.yml

@@ -1,4 +1,5 @@
 ---
+
 roles:
   - name: autonomic.add-users
     src: https://git.autonomic.zone/autonomic-cooperative/autonomic.add-users

tasks/main.yml

@@ -4,17 +4,14 @@
     that: "{{ item }} is defined"
     fail_msg: "You must define the '{{ item }}' variable"
   with_items:
-    - members
-    - new_hetzner_server_image
     - new_hetzner_server_name
     - new_hetzner_server_type
+    - new_hetzner_server_image
 
 - name: Include resource variables
-  include_vars: "{{ members }}"
-  tags:
-    - molecule-notest
+  include_vars: "{{ role_path }}/../../resources/{{ lookup('env', 'MEMBERS_FILE') | default('members.yml', True) }}"
 
-# Note(decentral1se): gives root SSH access for all members
+# Note(decentral1se): gives root SSH access for all autonomic members
 - name: Ensure all Autonomic member SSH keys are registered
   hcloud_ssh_key:
     name: "{{ item.email }}"
@@ -66,7 +63,7 @@
 
 - name: Run the add-users role on the new instance
   vars:
-    members: "{{ members }}"
+    members: "../../../resources/members.yml"
   delegate_to: root-new-instance
   import_role:
     name: autonomic.add-users